feat: twenty orm sync (#5266)

This PR is updating all object metadata entities with the new decorators, and deleting the old ones. This way we can use the new TwentyORM with all the standard objects. --------- Co-authored-by: Weiko <corentin@twenty.com>
2024-05-15 16:58:47 +02:00
parent 6898c1e4d8
commit f0383e3147
81 changed files with 1721 additions and 2060 deletions
--- a/packages/twenty-server/src/modules/activity/standard-objects/activity-target.object-metadata.ts
+++ b/packages/twenty-server/src/modules/activity/standard-objects/activity-target.object-metadata.ts
@ -1,22 +1,22 @@
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';

-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ACTIVITY_TARGET_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
-import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
 import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceDynamicRelation } from 'src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.activityTarget,
  namePlural: 'activityTargets',
  labelSingular: 'Activity Target',
@ -24,60 +24,73 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'An activity target',
  icon: 'IconCheckbox',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class ActivityTargetObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class ActivityTargetObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceRelation({
    standardId: ACTIVITY_TARGET_STANDARD_FIELD_IDS.activity,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Activity',
    description: 'ActivityTarget activity',
    icon: 'IconNotes',
    joinColumn: 'activityId',
+    inverseSideTarget: () => ActivityObjectMetadata,
+    inverseSideFieldKey: 'activityTargets',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  activity: Relation<ActivityObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_TARGET_STANDARD_FIELD_IDS.person,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Person',
    description: 'ActivityTarget person',
    icon: 'IconUser',
    joinColumn: 'personId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'activityTargets',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  person: Relation<PersonObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_TARGET_STANDARD_FIELD_IDS.company,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Company',
    description: 'ActivityTarget company',
    icon: 'IconBuildingSkyscraper',
    joinColumn: 'companyId',
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'activityTargets',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  company: Relation<CompanyObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_TARGET_STANDARD_FIELD_IDS.opportunity,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Opportunity',
    description: 'ActivityTarget opportunity',
    icon: 'IconTargetArrow',
    joinColumn: 'opportunityId',
+    inverseSideTarget: () => OpportunityObjectMetadata,
+    inverseSideFieldKey: 'activityTargets',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  opportunity: Relation<OpportunityObjectMetadata>;

-  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
-    standardId: ACTIVITY_TARGET_STANDARD_FIELD_IDS.custom,
-    name: oppositeObjectMetadata.nameSingular,
-    label: oppositeObjectMetadata.labelSingular,
-    description: `ActivityTarget ${oppositeObjectMetadata.labelSingular}`,
-    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
-    icon: 'IconBuildingSkyscraper',
-  }))
-  custom: Relation<CustomObjectMetadata>;
+  @WorkspaceDynamicRelation({
+    type: RelationMetadataType.MANY_TO_ONE,
+    argsFactory: (oppositeObjectMetadata) => ({
+      standardId: ACTIVITY_TARGET_STANDARD_FIELD_IDS.custom,
+      name: oppositeObjectMetadata.nameSingular,
+      label: oppositeObjectMetadata.labelSingular,
+      description: `ActivityTarget ${oppositeObjectMetadata.labelSingular}`,
+      joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+      icon: 'IconBuildingSkyscraper',
+    }),
+    inverseSideTarget: () => CustomWorkspaceEntity,
+    inverseSideFieldKey: 'activityTargets',
+  })
+  custom: Relation<CustomWorkspaceEntity>;
 }
--- a/packages/twenty-server/src/modules/activity/standard-objects/activity.object-metadata.ts
+++ b/packages/twenty-server/src/modules/activity/standard-objects/activity.object-metadata.ts
@ -7,19 +7,19 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { ACTIVITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
 import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
 import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CommentObjectMetadata } from 'src/modules/activity/standard-objects/comment.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.activity,
  namePlural: 'activities',
  labelSingular: 'Activity',
@ -27,10 +27,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'An activity',
  icon: 'IconCheckbox',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class ActivityObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class ActivityObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.title,
    type: FieldMetadataType.TEXT,
    label: 'Title',
@ -39,7 +39,7 @@ export class ActivityObjectMetadata extends BaseObjectMetadata {
  })
  title: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.body,
    type: FieldMetadataType.TEXT,
    label: 'Body',
@ -48,7 +48,7 @@ export class ActivityObjectMetadata extends BaseObjectMetadata {
  })
  body: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.type,
    type: FieldMetadataType.TEXT,
    label: 'Type',
@ -58,100 +58,97 @@ export class ActivityObjectMetadata extends BaseObjectMetadata {
  })
  type: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.reminderAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Reminder Date',
    description: 'Activity reminder date',
    icon: 'IconCalendarEvent',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  reminderAt: Date;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.dueAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Due Date',
    description: 'Activity due date',
    icon: 'IconCalendarEvent',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  dueAt: Date;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.completedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Completion Date',
    description: 'Activity completion date',
    icon: 'IconCheck',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  completedAt: Date;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.activityTargets,
-    type: FieldMetadataType.RELATION,
    label: 'Targets',
    description: 'Activity targets',
    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ActivityTargetObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  activityTargets: Relation<ActivityTargetObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.attachments,
-    type: FieldMetadataType.RELATION,
    label: 'Attachments',
    description: 'Activity attachments',
    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => AttachmentObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  attachments: Relation<AttachmentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.comments,
-    type: FieldMetadataType.RELATION,
    label: 'Comments',
    description: 'Activity comments',
    icon: 'IconComment',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CommentObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  comments: Relation<CommentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.author,
-    type: FieldMetadataType.RELATION,
    label: 'Author',
    description: 'Activity author',
    icon: 'IconUserCircle',
+    type: RelationMetadataType.MANY_TO_ONE,
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'authoredActivities',
+    onDelete: RelationOnDeleteAction.SET_NULL,
    joinColumn: 'authorId',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  author: Relation<WorkspaceMemberObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ACTIVITY_STANDARD_FIELD_IDS.assignee,
-    type: FieldMetadataType.RELATION,
    label: 'Assignee',
    description: 'Activity assignee',
    icon: 'IconUserCircle',
+    type: RelationMetadataType.MANY_TO_ONE,
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'assignedActivities',
+    onDelete: RelationOnDeleteAction.SET_NULL,
    joinColumn: 'assigneeId',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  assignee: Relation<WorkspaceMemberObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/activity/standard-objects/comment.object-metadata.ts
+++ b/packages/twenty-server/src/modules/activity/standard-objects/comment.object-metadata.ts
@ -3,15 +3,17 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { COMMENT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
 import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.comment,
  namePlural: 'comments',
  labelSingular: 'Comment',
@ -19,10 +21,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'A comment',
  icon: 'IconMessageCircle',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class CommentObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class CommentObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: COMMENT_STANDARD_FIELD_IDS.body,
    type: FieldMetadataType.TEXT,
    label: 'Body',
@ -31,23 +33,27 @@ export class CommentObjectMetadata extends BaseObjectMetadata {
  })
  body: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMMENT_STANDARD_FIELD_IDS.author,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Author',
    description: 'Comment author',
    icon: 'IconCircleUser',
    joinColumn: 'authorId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'authoredComments',
  })
  author: Relation<WorkspaceMemberObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMMENT_STANDARD_FIELD_IDS.activity,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Activity',
    description: 'Comment activity',
    icon: 'IconNotes',
    joinColumn: 'activityId',
+    inverseSideTarget: () => ActivityObjectMetadata,
+    inverseSideFieldKey: 'comments',
  })
  activity: Relation<ActivityObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/api-key/standard-objects/api-key.object-metadata.ts
+++ b/packages/twenty-server/src/modules/api-key/standard-objects/api-key.object-metadata.ts
@ -1,14 +1,14 @@
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
 import { API_KEY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.apiKey,
  namePlural: 'apiKeys',
  labelSingular: 'Api Key',
@ -16,10 +16,10 @@ import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-
  description: 'An api key',
  icon: 'IconRobot',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class ApiKeyObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class ApiKeyObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: API_KEY_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Name',
@ -28,7 +28,7 @@ export class ApiKeyObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: API_KEY_STANDARD_FIELD_IDS.expiresAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Expiration date',
@ -37,13 +37,13 @@ export class ApiKeyObjectMetadata extends BaseObjectMetadata {
  })
  expiresAt: Date;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: API_KEY_STANDARD_FIELD_IDS.revokedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Revocation date',
    description: 'ApiKey revocation date',
    icon: 'IconCalendar',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  revokedAt?: Date;
 }
--- a/packages/twenty-server/src/modules/attachment/standard-objects/attachment.object-metadata.ts
+++ b/packages/twenty-server/src/modules/attachment/standard-objects/attachment.object-metadata.ts
@ -3,21 +3,23 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { ATTACHMENT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
-import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
+import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
 import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceDynamicRelation } from 'src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.attachment,
  namePlural: 'attachments',
  labelSingular: 'Attachment',
@ -25,10 +27,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'An attachment',
  icon: 'IconFileImport',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class AttachmentObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class AttachmentObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Name',
@ -37,7 +39,7 @@ export class AttachmentObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.fullPath,
    type: FieldMetadataType.TEXT,
    label: 'Full path',
@ -46,7 +48,7 @@ export class AttachmentObjectMetadata extends BaseObjectMetadata {
  })
  fullPath: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.type,
    type: FieldMetadataType.TEXT,
    label: 'Type',
@ -55,67 +57,82 @@ export class AttachmentObjectMetadata extends BaseObjectMetadata {
  })
  type: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.author,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Author',
    description: 'Attachment author',
    icon: 'IconCircleUser',
    joinColumn: 'authorId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'authoredAttachments',
  })
  author: Relation<WorkspaceMemberObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.activity,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Activity',
    description: 'Attachment activity',
    icon: 'IconNotes',
    joinColumn: 'activityId',
+    inverseSideTarget: () => ActivityObjectMetadata,
+    inverseSideFieldKey: 'attachments',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  activity: Relation<ActivityObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.person,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Person',
    description: 'Attachment person',
    icon: 'IconUser',
    joinColumn: 'personId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'attachments',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  person: Relation<PersonObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.company,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Company',
    description: 'Attachment company',
    icon: 'IconBuildingSkyscraper',
    joinColumn: 'companyId',
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'attachments',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  company: Relation<CompanyObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: ATTACHMENT_STANDARD_FIELD_IDS.opportunity,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Opportunity',
    description: 'Attachment opportunity',
    icon: 'IconBuildingSkyscraper',
    joinColumn: 'opportunityId',
+    inverseSideTarget: () => OpportunityObjectMetadata,
+    inverseSideFieldKey: 'attachments',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  opportunity: Relation<OpportunityObjectMetadata>;

-  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
-    standardId: ATTACHMENT_STANDARD_FIELD_IDS.custom,
-    name: oppositeObjectMetadata.nameSingular,
-    label: oppositeObjectMetadata.labelSingular,
-    description: `Attachment ${oppositeObjectMetadata.labelSingular}`,
-    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
-    icon: 'IconBuildingSkyscraper',
-  }))
-  custom: Relation<CustomObjectMetadata>;
+  @WorkspaceDynamicRelation({
+    type: RelationMetadataType.MANY_TO_ONE,
+    argsFactory: (oppositeObjectMetadata) => ({
+      standardId: ATTACHMENT_STANDARD_FIELD_IDS.custom,
+      name: oppositeObjectMetadata.nameSingular,
+      label: oppositeObjectMetadata.labelSingular,
+      description: `Attachment ${oppositeObjectMetadata.labelSingular}`,
+      joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+      icon: 'IconBuildingSkyscraper',
+    }),
+    inverseSideTarget: () => CustomWorkspaceEntity,
+    inverseSideFieldKey: 'attachments',
+  })
+  custom: Relation<CustomWorkspaceEntity>;
 }
--- a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata.ts
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata.ts
@ -3,14 +3,17 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { CALENDAR_CHANNEL_EVENT_ASSOCIATION_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.calendarChannelEventAssociation,
  namePlural: 'calendarChannelEventAssociations',
  labelSingular: 'Calendar Channel Event Association',
@ -18,32 +21,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Calendar Channel Event Associations',
  icon: 'IconCalendar',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class CalendarChannelEventAssociationObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    standardId:
-      CALENDAR_CHANNEL_EVENT_ASSOCIATION_STANDARD_FIELD_IDS.calendarChannel,
-    type: FieldMetadataType.RELATION,
-    label: 'Channel ID',
-    description: 'Channel ID',
-    icon: 'IconCalendar',
-    joinColumn: 'calendarChannelId',
-  })
-  calendarChannel: Relation<CalendarEventObjectMetadata>;
-
-  @FieldMetadata({
-    standardId:
-      CALENDAR_CHANNEL_EVENT_ASSOCIATION_STANDARD_FIELD_IDS.calendarEvent,
-    type: FieldMetadataType.RELATION,
-    label: 'Event ID',
-    description: 'Event ID',
-    icon: 'IconCalendar',
-    joinColumn: 'calendarEventId',
-  })
-  calendarEvent: Relation<CalendarEventObjectMetadata>;
-
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class CalendarChannelEventAssociationObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId:
      CALENDAR_CHANNEL_EVENT_ASSOCIATION_STANDARD_FIELD_IDS.eventExternalId,
    type: FieldMetadataType.TEXT,
@ -52,4 +33,30 @@ export class CalendarChannelEventAssociationObjectMetadata extends BaseObjectMet
    icon: 'IconCalendar',
  })
  eventExternalId: string;
+
+  @WorkspaceRelation({
+    standardId:
+      CALENDAR_CHANNEL_EVENT_ASSOCIATION_STANDARD_FIELD_IDS.calendarChannel,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Channel ID',
+    description: 'Channel ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarChannelId',
+    inverseSideTarget: () => CalendarEventObjectMetadata,
+    inverseSideFieldKey: 'calendarChannelEventAssociations',
+  })
+  calendarChannel: Relation<CalendarEventObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId:
+      CALENDAR_CHANNEL_EVENT_ASSOCIATION_STANDARD_FIELD_IDS.calendarEvent,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Event ID',
+    description: 'Event ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarEventId',
+    inverseSideTarget: () => CalendarEventObjectMetadata,
+    inverseSideFieldKey: 'calendarChannelEventAssociations',
+  })
+  calendarEvent: Relation<CalendarEventObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel.object-metadata.ts
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-channel.object-metadata.ts
@ -7,21 +7,21 @@ import {
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { CALENDAR_CHANNEL_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
 import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

 export enum CalendarChannelVisibility {
  METADATA = 'METADATA',
  SHARE_EVERYTHING = 'SHARE_EVERYTHING',
 }

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.calendarChannel,
  namePlural: 'calendarChannels',
  labelSingular: 'Calendar Channel',
@ -29,20 +29,10 @@ export enum CalendarChannelVisibility {
  description: 'Calendar Channels',
  icon: 'IconCalendar',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    standardId: CALENDAR_CHANNEL_STANDARD_FIELD_IDS.connectedAccount,
-    type: FieldMetadataType.RELATION,
-    label: 'Connected Account',
-    description: 'Connected Account',
-    icon: 'IconUserCircle',
-    joinColumn: 'connectedAccountId',
-  })
-  connectedAccount: Relation<ConnectedAccountObjectMetadata>;
-
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class CalendarChannelObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: CALENDAR_CHANNEL_STANDARD_FIELD_IDS.handle,
    type: FieldMetadataType.TEXT,
    label: 'Handle',
@ -51,7 +41,7 @@ export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
  })
  handle: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_CHANNEL_STANDARD_FIELD_IDS.visibility,
    type: FieldMetadataType.SELECT,
    label: 'Visibility',
@ -75,7 +65,7 @@ export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
  })
  visibility: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId:
      CALENDAR_CHANNEL_STANDARD_FIELD_IDS.isContactAutoCreationEnabled,
    type: FieldMetadataType.BOOLEAN,
@ -86,7 +76,7 @@ export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
  })
  isContactAutoCreationEnabled: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_CHANNEL_STANDARD_FIELD_IDS.isSyncEnabled,
    type: FieldMetadataType.BOOLEAN,
    label: 'Is Sync Enabled',
@ -96,7 +86,7 @@ export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
  })
  isSyncEnabled: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_CHANNEL_STANDARD_FIELD_IDS.syncCursor,
    type: FieldMetadataType.TEXT,
    label: 'Sync Cursor',
@ -106,16 +96,25 @@ export class CalendarChannelObjectMetadata extends BaseObjectMetadata {
  })
  syncCursor: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
+    standardId: CALENDAR_CHANNEL_STANDARD_FIELD_IDS.connectedAccount,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Connected Account',
+    description: 'Connected Account',
+    icon: 'IconUserCircle',
+    joinColumn: 'connectedAccountId',
+    inverseSideTarget: () => ConnectedAccountObjectMetadata,
+    inverseSideFieldKey: 'calendarChannels',
+  })
+  connectedAccount: Relation<ConnectedAccountObjectMetadata>;
+
+  @WorkspaceRelation({
    standardId:
      CALENDAR_CHANNEL_STANDARD_FIELD_IDS.calendarChannelEventAssociations,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Calendar Channel Event Associations',
    description: 'Calendar Channel Event Associations',
    icon: 'IconCalendar',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CalendarChannelEventAssociationObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
--- a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event-participant.object-metadata.ts
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event-participant.object-metadata.ts
@ -3,15 +3,17 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';

 export enum CalendarEventParticipantResponseStatus {
  NEEDS_ACTION = 'NEEDS_ACTION',
@ -20,7 +22,7 @@ export enum CalendarEventParticipantResponseStatus {
  ACCEPTED = 'ACCEPTED',
 }

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.calendarEventParticipant,
  namePlural: 'calendarEventParticipants',
  labelSingular: 'Calendar event participant',
@ -28,20 +30,10 @@ export enum CalendarEventParticipantResponseStatus {
  description: 'Calendar event participants',
  icon: 'IconCalendar',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class CalendarEventParticipantObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.calendarEvent,
-    type: FieldMetadataType.RELATION,
-    label: 'Event ID',
-    description: 'Event ID',
-    icon: 'IconCalendar',
-    joinColumn: 'calendarEventId',
-  })
-  calendarEvent: Relation<CalendarEventObjectMetadata>;
-
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class CalendarEventParticipantObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.handle,
    type: FieldMetadataType.TEXT,
    label: 'Handle',
@ -50,7 +42,7 @@ export class CalendarEventParticipantObjectMetadata extends BaseObjectMetadata {
  })
  handle: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.displayName,
    type: FieldMetadataType.TEXT,
    label: 'Display Name',
@ -59,7 +51,7 @@ export class CalendarEventParticipantObjectMetadata extends BaseObjectMetadata {
  })
  displayName: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.isOrganizer,
    type: FieldMetadataType.BOOLEAN,
    label: 'Is Organizer',
@ -69,7 +61,7 @@ export class CalendarEventParticipantObjectMetadata extends BaseObjectMetadata {
  })
  isOrganizer: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.responseStatus,
    type: FieldMetadataType.SELECT,
    label: 'Response Status',
@ -105,25 +97,41 @@ export class CalendarEventParticipantObjectMetadata extends BaseObjectMetadata {
  })
  responseStatus: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
+    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.calendarEvent,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Event ID',
+    description: 'Event ID',
+    icon: 'IconCalendar',
+    joinColumn: 'calendarEventId',
+    inverseSideTarget: () => CalendarEventObjectMetadata,
+    inverseSideFieldKey: 'calendarEventParticipants',
+  })
+  calendarEvent: Relation<CalendarEventObjectMetadata>;
+
+  @WorkspaceRelation({
    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.person,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Person',
    description: 'Person',
    icon: 'IconUser',
    joinColumn: 'personId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'calendarEventParticipants',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  person: Relation<PersonObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: CALENDAR_EVENT_PARTICIPANT_STANDARD_FIELD_IDS.workspaceMember,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Workspace Member',
    description: 'Workspace Member',
    icon: 'IconUser',
    joinColumn: 'workspaceMemberId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'calendarEventParticipants',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event.object-metadata.ts
+++ b/packages/twenty-server/src/modules/calendar/standard-objects/calendar-event.object-metadata.ts
@ -1,24 +1,24 @@
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';

-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
  RelationMetadataType,
  RelationOnDeleteAction,
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
 import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
 import { CALENDAR_EVENT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { LinkMetadata } from 'src/engine/metadata-modules/field-metadata/composite-types/link.composite-type';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.calendarEvent,
  namePlural: 'calendarEvents',
  labelSingular: 'Calendar event',
@ -26,10 +26,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Calendar events',
  icon: 'IconCalendar',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class CalendarEventObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class CalendarEventObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.title,
    type: FieldMetadataType.TEXT,
    label: 'Title',
@ -38,7 +38,7 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  title: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.isCanceled,
    type: FieldMetadataType.BOOLEAN,
    label: 'Is canceled',
@ -47,7 +47,7 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  isCanceled: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.isFullDay,
    type: FieldMetadataType.BOOLEAN,
    label: 'Is Full Day',
@ -56,47 +56,47 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  isFullDay: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.startsAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Start Date',
    description: 'Start Date',
    icon: 'IconCalendarClock',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  startsAt: string | null;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.endsAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'End Date',
    description: 'End Date',
    icon: 'IconCalendarClock',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  endsAt: string | null;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.externalCreatedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Creation DateTime',
    description: 'Creation DateTime',
    icon: 'IconCalendarPlus',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  externalCreatedAt: string | null;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.externalUpdatedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Update DateTime',
    description: 'Update DateTime',
    icon: 'IconCalendarCog',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  externalUpdatedAt: string | null;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.description,
    type: FieldMetadataType.TEXT,
    label: 'Description',
@ -105,7 +105,7 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  description: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.location,
    type: FieldMetadataType.TEXT,
    label: 'Location',
@ -114,7 +114,7 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  location: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.iCalUID,
    type: FieldMetadataType.TEXT,
    label: 'iCal UID',
@ -123,7 +123,7 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  iCalUID: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.conferenceSolution,
    type: FieldMetadataType.TEXT,
    label: 'Conference Solution',
@ -132,17 +132,17 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  conferenceSolution: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.conferenceLink,
    type: FieldMetadataType.LINK,
    label: 'Meet Link',
    description: 'Meet Link',
    icon: 'IconLink',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  conferenceLink: LinkMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.recurringEventExternalId,
    type: FieldMetadataType.TEXT,
    label: 'Recurring Event ID',
@ -151,33 +151,26 @@ export class CalendarEventObjectMetadata extends BaseObjectMetadata {
  })
  recurringEventExternalId: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId:
      CALENDAR_EVENT_STANDARD_FIELD_IDS.calendarChannelEventAssociations,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Calendar Channel Event Associations',
    description: 'Calendar Channel Event Associations',
    icon: 'IconCalendar',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CalendarChannelEventAssociationObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
-    inverseSideFieldKey: 'calendarEvent',
  })
  calendarChannelEventAssociations: Relation<
    CalendarChannelEventAssociationObjectMetadata[]
  >;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: CALENDAR_EVENT_STANDARD_FIELD_IDS.calendarEventParticipants,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Event Participants',
    description: 'Event Participants',
    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CalendarEventParticipantObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
--- a/packages/twenty-server/src/modules/company/standard-objects/company.object-metadata.ts
+++ b/packages/twenty-server/src/modules/company/standard-objects/company.object-metadata.ts
@ -9,21 +9,21 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { COMPANY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
 import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
 import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
 import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
 import { TimelineActivityObjectMetadata } from 'src/modules/timeline/standard-objects/timeline-activity.object-metadata';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.company,
  namePlural: 'companies',
  labelSingular: 'Company',
@ -31,8 +31,8 @@ import { TimelineActivityObjectMetadata } from 'src/modules/timeline/standard-ob
  description: 'A company',
  icon: 'IconBuildingSkyscraper',
 })
-export class CompanyObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+export class CompanyObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Name',
@ -41,7 +41,7 @@ export class CompanyObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.domainName,
    type: FieldMetadataType.TEXT,
    label: 'Domain Name',
@ -51,7 +51,7 @@ export class CompanyObjectMetadata extends BaseObjectMetadata {
  })
  domainName?: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.address,
    type: FieldMetadataType.TEXT,
    label: 'Address',
@ -60,37 +60,37 @@ export class CompanyObjectMetadata extends BaseObjectMetadata {
  })
  address: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.employees,
    type: FieldMetadataType.NUMBER,
    label: 'Employees',
    description: 'Number of employees in the company',
    icon: 'IconUsers',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  employees: number;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.linkedinLink,
    type: FieldMetadataType.LINK,
    label: 'Linkedin',
    description: 'The company Linkedin account',
    icon: 'IconBrandLinkedin',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  linkedinLink: LinkMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.xLink,
    type: FieldMetadataType.LINK,
    label: 'X',
    description: 'The company Twitter/X account',
    icon: 'IconBrandX',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  xLink: LinkMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.annualRecurringRevenue,
    type: FieldMetadataType.CURRENCY,
    label: 'ARR',
@ -98,10 +98,10 @@ export class CompanyObjectMetadata extends BaseObjectMetadata {
      'Annual Recurring Revenue: The actual or estimated annual revenue of the company',
    icon: 'IconMoneybag',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  annualRecurringRevenue: CurrencyMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.idealCustomerProfile,
    type: FieldMetadataType.BOOLEAN,
    label: 'ICP',
@ -112,119 +112,104 @@ export class CompanyObjectMetadata extends BaseObjectMetadata {
  })
  idealCustomerProfile: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: COMPANY_STANDARD_FIELD_IDS.position,
    type: FieldMetadataType.POSITION,
    label: 'Position',
    description: 'Company record position',
    icon: 'IconHierarchy2',
  })
-  @IsSystem()
-  @IsNullable()
+  @WorkspaceIsSystem()
+  @WorkspaceIsNullable()
  position: number;

  // Relations
-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.people,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'People',
    description: 'People linked to the company.',
    icon: 'IconUsers',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => PersonObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  people: Relation<PersonObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.accountOwner,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Account Owner',
    description:
      'Your team member responsible for managing the company account',
    icon: 'IconUserCircle',
    joinColumn: 'accountOwnerId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'accountOwnerForCompanies',
+    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
-  accountOwner: WorkspaceMemberObjectMetadata;
+  @WorkspaceIsNullable()
+  accountOwner: Relation<WorkspaceMemberObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.activityTargets,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Activities',
    description: 'Activities tied to the company',
    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ActivityTargetObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  activityTargets: Relation<ActivityTargetObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.opportunities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Opportunities',
    description: 'Opportunities linked to the company.',
    icon: 'IconTargetArrow',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => OpportunityObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  opportunities: Relation<OpportunityObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.favorites,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Favorites',
    description: 'Favorites linked to the company',
    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => FavoriteObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
-  @IsSystem()
+  @WorkspaceIsNullable()
+  @WorkspaceIsSystem()
  favorites: Relation<FavoriteObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.attachments,
-    type: FieldMetadataType.RELATION,
-    label: 'Attachments',
-    description: 'Attachments linked to the company.',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Attachments',
+    description: 'Attachments linked to the company',
+    icon: 'IconFileImport',
    inverseSideTarget: () => AttachmentObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  attachments: Relation<AttachmentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: COMPANY_STANDARD_FIELD_IDS.timelineActivities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Timeline Activities',
    description: 'Timeline Activities linked to the company',
    icon: 'IconIconTimelineEvent',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => TimelineActivityObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
-  @IsSystem()
+  @WorkspaceIsNullable()
+  @WorkspaceIsSystem()
  timelineActivities: Relation<TimelineActivityObjectMetadata[]>;
 }
--- a/packages/twenty-server/src/modules/connected-account/standard-objects/blocklist.object-metadata.ts
+++ b/packages/twenty-server/src/modules/connected-account/standard-objects/blocklist.object-metadata.ts
@ -3,14 +3,16 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { BLOCKLIST_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.blocklist,
  namePlural: 'blocklists',
  labelSingular: 'Blocklist',
@ -18,10 +20,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Blocklist',
  icon: 'IconForbid2',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class BlocklistObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class BlocklistObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: BLOCKLIST_STANDARD_FIELD_IDS.handle,
    type: FieldMetadataType.TEXT,
    label: 'Handle',
@ -30,13 +32,15 @@ export class BlocklistObjectMetadata extends BaseObjectMetadata {
  })
  handle: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: BLOCKLIST_STANDARD_FIELD_IDS.workspaceMember,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'WorkspaceMember',
    description: 'WorkspaceMember',
    icon: 'IconCircleUser',
    joinColumn: 'workspaceMemberId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'blocklist',
  })
  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.object-metadata.ts
+++ b/packages/twenty-server/src/modules/connected-account/standard-objects/connected-account.object-metadata.ts
@ -7,22 +7,22 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { CONNECTED_ACCOUNT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
 import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';

 export enum ConnectedAccountProvider {
  GOOGLE = 'google',
 }

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.connectedAccount,
  namePlural: 'connectedAccounts',
  labelSingular: 'Connected Account',
@ -30,10 +30,10 @@ export enum ConnectedAccountProvider {
  description: 'A connected account',
  icon: 'IconAt',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class ConnectedAccountObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.handle,
    type: FieldMetadataType.TEXT,
    label: 'handle',
@ -42,7 +42,7 @@ export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
  })
  handle: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.provider,
    type: FieldMetadataType.TEXT,
    label: 'provider',
@ -51,7 +51,7 @@ export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
  })
  provider: ConnectedAccountProvider; // field metadata should be a SELECT

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.accessToken,
    type: FieldMetadataType.TEXT,
    label: 'Access Token',
@ -60,7 +60,7 @@ export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
  })
  accessToken: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.refreshToken,
    type: FieldMetadataType.TEXT,
    label: 'Refresh Token',
@ -69,17 +69,7 @@ export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
  })
  refreshToken: string;

-  @FieldMetadata({
-    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.accountOwner,
-    type: FieldMetadataType.RELATION,
-    label: 'Account Owner',
-    description: 'Account Owner',
-    icon: 'IconUserCircle',
-    joinColumn: 'accountOwnerId',
-  })
-  accountOwner: Relation<WorkspaceMemberObjectMetadata>;
-
-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.lastSyncHistoryId,
    type: FieldMetadataType.TEXT,
    label: 'Last sync history ID',
@ -88,39 +78,45 @@ export class ConnectedAccountObjectMetadata extends BaseObjectMetadata {
  })
  lastSyncHistoryId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.authFailedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Auth failed at',
    description: 'Auth failed at',
    icon: 'IconX',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  authFailedAt: Date;

-  @FieldMetadata({
-    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.messageChannels,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel',
-    description: 'Message Channel',
-    icon: 'IconMessage',
+  @WorkspaceRelation({
+    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.accountOwner,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Account Owner',
+    description: 'Account Owner',
+    icon: 'IconUserCircle',
+    joinColumn: 'accountOwnerId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'connectedAccounts',
  })
-  @RelationMetadata({
+  accountOwner: Relation<WorkspaceMemberObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.messageChannels,
    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Message Channels',
+    description: 'Message Channels',
+    icon: 'IconMessage',
    inverseSideTarget: () => MessageChannelObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
  messageChannels: Relation<MessageChannelObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: CONNECTED_ACCOUNT_STANDARD_FIELD_IDS.calendarChannels,
-    type: FieldMetadataType.RELATION,
-    label: 'Calendar Channel',
-    description: 'Calendar Channel',
-    icon: 'IconCalendar',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Calendar Channels',
+    description: 'Calendar Channels',
+    icon: 'IconCalendar',
    inverseSideTarget: () => CalendarChannelObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
--- a/packages/twenty-server/src/modules/favorite/standard-objects/favorite.object-metadata.ts
+++ b/packages/twenty-server/src/modules/favorite/standard-objects/favorite.object-metadata.ts
@ -3,20 +3,22 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { FAVORITE_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
-import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
+import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceDynamicRelation } from 'src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.favorite,
  namePlural: 'favorites',
  labelSingular: 'Favorite',
@ -24,10 +26,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'A favorite',
  icon: 'IconHeart',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class FavoriteObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class FavoriteObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: FAVORITE_STANDARD_FIELD_IDS.position,
    type: FieldMetadataType.NUMBER,
    label: 'Position',
@ -38,56 +40,69 @@ export class FavoriteObjectMetadata extends BaseObjectMetadata {
  position: number;

  // Relations
-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: FAVORITE_STANDARD_FIELD_IDS.workspaceMember,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Workspace Member',
    description: 'Favorite workspace member',
    icon: 'IconCircleUser',
    joinColumn: 'workspaceMemberId',
+    inverseSideFieldKey: 'favorites',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
  })
  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: FAVORITE_STANDARD_FIELD_IDS.person,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Person',
    description: 'Favorite person',
    icon: 'IconUser',
    joinColumn: 'personId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'favorites',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  person: Relation<PersonObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: FAVORITE_STANDARD_FIELD_IDS.company,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Company',
    description: 'Favorite company',
    icon: 'IconBuildingSkyscraper',
    joinColumn: 'companyId',
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'favorites',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  company: Relation<CompanyObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: FAVORITE_STANDARD_FIELD_IDS.opportunity,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Opportunity',
    description: 'Favorite opportunity',
    icon: 'IconTargetArrow',
    joinColumn: 'opportunityId',
+    inverseSideTarget: () => OpportunityObjectMetadata,
+    inverseSideFieldKey: 'favorites',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  opportunity: Relation<OpportunityObjectMetadata>;

-  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
-    standardId: FAVORITE_STANDARD_FIELD_IDS.custom,
-    name: oppositeObjectMetadata.nameSingular,
-    label: oppositeObjectMetadata.labelSingular,
-    description: `Favorite ${oppositeObjectMetadata.labelSingular}`,
-    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
-    icon: 'IconBuildingSkyscraper',
-  }))
-  custom: Relation<CustomObjectMetadata>;
+  @WorkspaceDynamicRelation({
+    type: RelationMetadataType.MANY_TO_ONE,
+    argsFactory: (oppositeObjectMetadata) => ({
+      standardId: FAVORITE_STANDARD_FIELD_IDS.custom,
+      name: oppositeObjectMetadata.nameSingular,
+      label: oppositeObjectMetadata.labelSingular,
+      description: `Favorite ${oppositeObjectMetadata.labelSingular}`,
+      joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+      icon: 'IconBuildingSkyscraper',
+    }),
+    inverseSideTarget: () => CustomWorkspaceEntity,
+    inverseSideFieldKey: 'favorites',
+  })
+  custom: Relation<CustomWorkspaceEntity>;
 }
--- a/packages/twenty-server/src/modules/messaging/standard-objects/message-channel-message-association.object-metadata.ts
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-channel-message-association.object-metadata.ts
@ -3,17 +3,19 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { MessageChannelObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel.object-metadata';
 import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
 import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.messageChannelMessageAssociation,
  namePlural: 'messageChannelMessageAssociations',
  labelSingular: 'Message Channel Message Association',
@ -21,33 +23,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Message Synced with a Message Channel',
  icon: 'IconMessage',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class MessageChannelMessageAssociationObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    standardId:
-      MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.messageChannel,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Id',
-    description: 'Message Channel Id',
-    icon: 'IconHash',
-    joinColumn: 'messageChannelId',
-  })
-  @IsNullable()
-  messageChannel: Relation<MessageChannelObjectMetadata>;
-
-  @FieldMetadata({
-    standardId: MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.message,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Id',
-    description: 'Message Id',
-    icon: 'IconHash',
-    joinColumn: 'messageId',
-  })
-  @IsNullable()
-  message: Relation<MessageObjectMetadata>;
-
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class MessageChannelMessageAssociationObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId:
      MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.messageExternalId,
    type: FieldMetadataType.TEXT,
@ -55,22 +34,10 @@ export class MessageChannelMessageAssociationObjectMetadata extends BaseObjectMe
    description: 'Message id from the messaging provider',
    icon: 'IconHash',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  messageExternalId: string;

-  @FieldMetadata({
-    standardId:
-      MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.messageThread,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Thread Id',
-    description: 'Message Thread Id',
-    icon: 'IconHash',
-    joinColumn: 'messageThreadId',
-  })
-  @IsNullable()
-  messageThread: Relation<MessageThreadObjectMetadata>;
-
-  @FieldMetadata({
+  @WorkspaceField({
    standardId:
      MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.messageThreadExternalId,
    type: FieldMetadataType.TEXT,
@ -78,6 +45,47 @@ export class MessageChannelMessageAssociationObjectMetadata extends BaseObjectMe
    description: 'Thread id from the messaging provider',
    icon: 'IconHash',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  messageThreadExternalId: string;
+
+  @WorkspaceRelation({
+    standardId:
+      MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.messageChannel,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Message Channel Id',
+    description: 'Message Channel Id',
+    icon: 'IconHash',
+    joinColumn: 'messageChannelId',
+    inverseSideTarget: () => MessageChannelObjectMetadata,
+    inverseSideFieldKey: 'messageChannelMessageAssociations',
+  })
+  @WorkspaceIsNullable()
+  messageChannel: Relation<MessageChannelObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId: MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.message,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Message Id',
+    description: 'Message Id',
+    icon: 'IconHash',
+    joinColumn: 'messageId',
+    inverseSideTarget: () => MessageObjectMetadata,
+    inverseSideFieldKey: 'messageChannelMessageAssociations',
+  })
+  @WorkspaceIsNullable()
+  message: Relation<MessageObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId:
+      MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_STANDARD_FIELD_IDS.messageThread,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Message Thread Id',
+    description: 'Message Thread Id',
+    icon: 'IconHash',
+    joinColumn: 'messageThreadId',
+    inverseSideTarget: () => MessageThreadObjectMetadata,
+    inverseSideFieldKey: 'messageChannelMessageAssociations',
+  })
+  @WorkspaceIsNullable()
+  messageThread: Relation<MessageThreadObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/messaging/standard-objects/message-channel.object-metadata.ts
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-channel.object-metadata.ts
@ -7,15 +7,15 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { MESSAGE_CHANNEL_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
 import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

 export enum MessageChannelSyncStatus {
  PENDING = 'PENDING',
@ -35,7 +35,7 @@ export enum MessageChannelType {
  SMS = 'sms',
 }

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.messageChannel,
  namePlural: 'messageChannels',
  labelSingular: 'Message Channel',
@ -43,10 +43,10 @@ export enum MessageChannelType {
  description: 'Message Channels',
  icon: 'IconMessage',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class MessageChannelObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class MessageChannelObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.visibility,
    type: FieldMetadataType.SELECT,
    label: 'Visibility',
@ -76,7 +76,7 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
  })
  visibility: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.handle,
    type: FieldMetadataType.TEXT,
    label: 'Handle',
@ -85,17 +85,7 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
  })
  handle: string;

-  @FieldMetadata({
-    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.connectedAccount,
-    type: FieldMetadataType.RELATION,
-    label: 'Connected Account',
-    description: 'Connected Account',
-    icon: 'IconUserCircle',
-    joinColumn: 'connectedAccountId',
-  })
-  connectedAccount: Relation<ConnectedAccountObjectMetadata>;
-
-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.type,
    type: FieldMetadataType.SELECT,
    label: 'Type',
@ -119,7 +109,7 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
  })
  type: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.isContactAutoCreationEnabled,
    type: FieldMetadataType.BOOLEAN,
    label: 'Is Contact Auto Creation Enabled',
@ -129,7 +119,7 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
  })
  isContactAutoCreationEnabled: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.isSyncEnabled,
    type: FieldMetadataType.BOOLEAN,
    label: 'Is Sync Enabled',
@ -139,25 +129,7 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
  })
  isSyncEnabled: boolean;

-  @FieldMetadata({
-    standardId:
-      MESSAGE_CHANNEL_STANDARD_FIELD_IDS.messageChannelMessageAssociations,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Association',
-    description: 'Messages from the channel.',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
-    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
-    onDelete: RelationOnDeleteAction.CASCADE,
-  })
-  @IsNullable()
-  messageChannelMessageAssociations: Relation<
-    MessageChannelMessageAssociationObjectMetadata[]
-  >;
-
-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.syncCursor,
    type: FieldMetadataType.TEXT,
    label: 'Last sync cursor',
@ -166,17 +138,17 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
  })
  syncCursor: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.syncedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Last sync date',
    description: 'Last sync date',
    icon: 'IconHistory',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  syncedAt: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.syncStatus,
    type: FieldMetadataType.SELECT,
    label: 'Last sync status',
@ -209,16 +181,43 @@ export class MessageChannelObjectMetadata extends BaseObjectMetadata {
      },
    ],
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  syncStatus: MessageChannelSyncStatus;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.ongoingSyncStartedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Ongoing sync started at',
    description: 'Ongoing sync started at',
    icon: 'IconHistory',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  ongoingSyncStartedAt: string;
+
+  @WorkspaceRelation({
+    standardId: MESSAGE_CHANNEL_STANDARD_FIELD_IDS.connectedAccount,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Connected Account',
+    description: 'Connected Account',
+    icon: 'IconUserCircle',
+    joinColumn: 'connectedAccountId',
+    inverseSideTarget: () => ConnectedAccountObjectMetadata,
+    inverseSideFieldKey: 'messageChannels',
+  })
+  connectedAccount: Relation<ConnectedAccountObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId:
+      MESSAGE_CHANNEL_STANDARD_FIELD_IDS.messageChannelMessageAssociations,
+    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Message Channel Association',
+    description: 'Messages from the channel.',
+    icon: 'IconMessage',
+    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @WorkspaceIsNullable()
+  messageChannelMessageAssociations: Relation<
+    MessageChannelMessageAssociationObjectMetadata[]
+  >;
 }
--- a/packages/twenty-server/src/modules/messaging/standard-objects/message-participant.object-metadata.ts
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-participant.object-metadata.ts
@ -3,17 +3,19 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.messageParticipant,
  namePlural: 'messageParticipants',
  labelSingular: 'Message Participant',
@ -21,20 +23,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Message Participants',
  icon: 'IconUserCircle',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class MessageParticipantObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
-    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.message,
-    type: FieldMetadataType.RELATION,
-    label: 'Message',
-    description: 'Message',
-    icon: 'IconMessage',
-    joinColumn: 'messageId',
-  })
-  message: Relation<MessageObjectMetadata>;
-
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class MessageParticipantObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.role,
    type: FieldMetadataType.SELECT,
    label: 'Role',
@ -50,7 +42,7 @@ export class MessageParticipantObjectMetadata extends BaseObjectMetadata {
  })
  role: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.handle,
    type: FieldMetadataType.TEXT,
    label: 'Handle',
@ -59,7 +51,7 @@ export class MessageParticipantObjectMetadata extends BaseObjectMetadata {
  })
  handle: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.displayName,
    type: FieldMetadataType.TEXT,
    label: 'Display Name',
@ -68,25 +60,41 @@ export class MessageParticipantObjectMetadata extends BaseObjectMetadata {
  })
  displayName: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
+    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.message,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Message',
+    description: 'Message',
+    icon: 'IconMessage',
+    joinColumn: 'messageId',
+    inverseSideTarget: () => MessageObjectMetadata,
+    inverseSideFieldKey: 'messageParticipants',
+  })
+  message: Relation<MessageObjectMetadata>;
+
+  @WorkspaceRelation({
    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.person,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Person',
    description: 'Person',
    icon: 'IconUser',
    joinColumn: 'personId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'messageParticipants',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  person: Relation<PersonObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: MESSAGE_PARTICIPANT_STANDARD_FIELD_IDS.workspaceMember,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Workspace Member',
    description: 'Workspace member',
    icon: 'IconCircleUser',
    joinColumn: 'workspaceMemberId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'messageParticipants',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/messaging/standard-objects/message-thread.object-metadata.ts
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message-thread.object-metadata.ts
@ -1,23 +1,21 @@
 import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/relation.interface';

-import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import {
  RelationMetadataType,
  RelationOnDeleteAction,
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { MESSAGE_THREAD_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
 import { MessageObjectMetadata } from 'src/modules/messaging/standard-objects/message.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.messageThread,
  namePlural: 'messageThreads',
  labelSingular: 'Message Thread',
@ -25,38 +23,32 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Message Thread',
  icon: 'IconMessage',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class MessageThreadObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class MessageThreadObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceRelation({
    standardId: MESSAGE_THREAD_STANDARD_FIELD_IDS.messages,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Messages',
    description: 'Messages from the thread.',
    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => MessageObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  messages: Relation<MessageObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId:
      MESSAGE_THREAD_STANDARD_FIELD_IDS.messageChannelMessageAssociations,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Channel Association',
-    description: 'Messages from the channel.',
-    icon: 'IconMessage',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Message Channel Association',
+    description: 'Messages from the channel',
+    icon: 'IconMessage',
    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
    onDelete: RelationOnDeleteAction.RESTRICT,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  messageChannelMessageAssociations: Relation<
    MessageChannelMessageAssociationObjectMetadata[]
  >;
--- a/packages/twenty-server/src/modules/messaging/standard-objects/message.object-metadata.ts
+++ b/packages/twenty-server/src/modules/messaging/standard-objects/message.object-metadata.ts
@ -7,18 +7,18 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { MESSAGE_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { MessageChannelMessageAssociationObjectMetadata } from 'src/modules/messaging/standard-objects/message-channel-message-association.object-metadata';
 import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
 import { MessageThreadObjectMetadata } from 'src/modules/messaging/standard-objects/message-thread.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.message,
  namePlural: 'messages',
  labelSingular: 'Message',
@ -26,10 +26,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'Message',
  icon: 'IconMessage',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class MessageObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class MessageObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: MESSAGE_STANDARD_FIELD_IDS.headerMessageId,
    type: FieldMetadataType.TEXT,
    label: 'Header message Id',
@ -38,18 +38,7 @@ export class MessageObjectMetadata extends BaseObjectMetadata {
  })
  headerMessageId: string;

-  @FieldMetadata({
-    standardId: MESSAGE_STANDARD_FIELD_IDS.messageThread,
-    type: FieldMetadataType.RELATION,
-    label: 'Message Thread Id',
-    description: 'Message Thread Id',
-    icon: 'IconHash',
-    joinColumn: 'messageThreadId',
-  })
-  @IsNullable()
-  messageThread: Relation<MessageThreadObjectMetadata>;
-
-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_STANDARD_FIELD_IDS.direction,
    type: FieldMetadataType.SELECT,
    label: 'Direction',
@ -63,7 +52,7 @@ export class MessageObjectMetadata extends BaseObjectMetadata {
  })
  direction: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_STANDARD_FIELD_IDS.subject,
    type: FieldMetadataType.TEXT,
    label: 'Subject',
@ -72,7 +61,7 @@ export class MessageObjectMetadata extends BaseObjectMetadata {
  })
  subject: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_STANDARD_FIELD_IDS.text,
    type: FieldMetadataType.TEXT,
    label: 'Text',
@ -81,45 +70,52 @@ export class MessageObjectMetadata extends BaseObjectMetadata {
  })
  text: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: MESSAGE_STANDARD_FIELD_IDS.receivedAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Received At',
    description: 'The date the message was received',
    icon: 'IconCalendar',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  receivedAt: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
+    standardId: MESSAGE_STANDARD_FIELD_IDS.messageThread,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Message Thread Id',
+    description: 'Message Thread Id',
+    icon: 'IconHash',
+    joinColumn: 'messageThreadId',
+    inverseSideTarget: () => MessageThreadObjectMetadata,
+    inverseSideFieldKey: 'messages',
+    onDelete: RelationOnDeleteAction.CASCADE,
+  })
+  @WorkspaceIsNullable()
+  messageThread: Relation<MessageThreadObjectMetadata>;
+
+  @WorkspaceRelation({
    standardId: MESSAGE_STANDARD_FIELD_IDS.messageParticipants,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Message Participants',
    description: 'Message Participants',
    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => MessageParticipantObjectMetadata,
-    inverseSideFieldKey: 'message',
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  messageParticipants: Relation<MessageParticipantObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: MESSAGE_STANDARD_FIELD_IDS.messageChannelMessageAssociations,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Message Channel Association',
    description: 'Messages from the channel.',
    icon: 'IconMessage',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => MessageChannelMessageAssociationObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  messageChannelMessageAssociations: Relation<
    MessageChannelMessageAssociationObjectMetadata[]
  >;
--- a/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.object-metadata.ts
+++ b/packages/twenty-server/src/modules/opportunity/standard-objects/opportunity.object-metadata.ts
@ -8,21 +8,21 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { OPPORTUNITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
 import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
 import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { TimelineActivityObjectMetadata } from 'src/modules/timeline/standard-objects/timeline-activity.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.opportunity,
  namePlural: 'opportunities',
  labelSingular: 'Opportunity',
@ -30,9 +30,9 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'An opportunity',
  icon: 'IconTargetArrow',
 })
-@IsNotAuditLogged()
-export class OpportunityObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+export class OpportunityObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Name',
@ -41,27 +41,27 @@ export class OpportunityObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.amount,
    type: FieldMetadataType.CURRENCY,
    label: 'Amount',
    description: 'Opportunity amount',
    icon: 'IconCurrencyDollar',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  amount: CurrencyMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.closeDate,
    type: FieldMetadataType.DATE_TIME,
    label: 'Close date',
    description: 'Opportunity close date',
    icon: 'IconCalendarEvent',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  closeDate: Date;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.probability,
    type: FieldMetadataType.TEXT,
    label: 'Probability',
@ -71,7 +71,7 @@ export class OpportunityObjectMetadata extends BaseObjectMetadata {
  })
  probability: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.stage,
    type: FieldMetadataType.SELECT,
    label: 'Stage',
@ -93,97 +93,91 @@ export class OpportunityObjectMetadata extends BaseObjectMetadata {
  })
  stage: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.position,
    type: FieldMetadataType.POSITION,
    label: 'Position',
    description: 'Opportunity record position',
    icon: 'IconHierarchy2',
  })
-  @IsSystem()
-  @IsNullable()
+  @WorkspaceIsSystem()
+  @WorkspaceIsNullable()
  position: number;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.pointOfContact,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Point of Contact',
    description: 'Opportunity point of contact',
    icon: 'IconUser',
    joinColumn: 'pointOfContactId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'pointOfContactForOpportunities',
+    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  pointOfContact: Relation<PersonObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.company,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Company',
    description: 'Opportunity company',
    icon: 'IconBuildingSkyscraper',
    joinColumn: 'companyId',
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'opportunities',
+    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  company: Relation<CompanyObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.favorites,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Favorites',
    description: 'Favorites linked to the opportunity',
    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => FavoriteObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
-  @IsSystem()
+  @WorkspaceIsNullable()
+  @WorkspaceIsSystem()
  favorites: Relation<FavoriteObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.activityTargets,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Activities',
    description: 'Activities tied to the opportunity',
    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ActivityTargetObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  activityTargets: Relation<ActivityTargetObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.attachments,
-    type: FieldMetadataType.RELATION,
-    label: 'Attachments',
-    description: 'Attachments linked to the opportunity.',
-    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Attachments',
+    description: 'Attachments linked to the opportunity',
+    icon: 'IconFileImport',
    inverseSideTarget: () => AttachmentObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  attachments: Relation<AttachmentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: OPPORTUNITY_STANDARD_FIELD_IDS.timelineActivities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Timeline Activities',
    description: 'Timeline Activities linked to the opportunity.',
    icon: 'IconTimelineEvent',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => TimelineActivityObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  timelineActivities: Relation<TimelineActivityObjectMetadata[]>;
 }
--- a/packages/twenty-server/src/modules/person/standard-objects/person.object-metadata.ts
+++ b/packages/twenty-server/src/modules/person/standard-objects/person.object-metadata.ts
@ -9,22 +9,22 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { PERSON_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
 import { ActivityTargetObjectMetadata } from 'src/modules/activity/standard-objects/activity-target.object-metadata';
 import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
 import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
 import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
 import { TimelineActivityObjectMetadata } from 'src/modules/timeline/standard-objects/timeline-activity.object-metadata';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.person,
  namePlural: 'people',
  labelSingular: 'Person',
@ -32,18 +32,18 @@ import { TimelineActivityObjectMetadata } from 'src/modules/timeline/standard-ob
  description: 'A person',
  icon: 'IconUser',
 })
-export class PersonObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+export class PersonObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.FULL_NAME,
    label: 'Name',
    description: 'Contact’s name',
    icon: 'IconUser',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  name: FullNameMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.email,
    type: FieldMetadataType.EMAIL,
    label: 'Email',
@ -52,27 +52,27 @@ export class PersonObjectMetadata extends BaseObjectMetadata {
  })
  email: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.linkedinLink,
    type: FieldMetadataType.LINK,
    label: 'Linkedin',
    description: 'Contact’s Linkedin account',
    icon: 'IconBrandLinkedin',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  linkedinLink: LinkMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.xLink,
    type: FieldMetadataType.LINK,
    label: 'X',
    description: 'Contact’s X/Twitter account',
    icon: 'IconBrandX',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  xLink: LinkMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.jobTitle,
    type: FieldMetadataType.TEXT,
    label: 'Job Title',
@ -81,7 +81,7 @@ export class PersonObjectMetadata extends BaseObjectMetadata {
  })
  jobTitle: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.phone,
    type: FieldMetadataType.TEXT,
    label: 'Phone',
@ -90,7 +90,7 @@ export class PersonObjectMetadata extends BaseObjectMetadata {
  })
  phone: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.city,
    type: FieldMetadataType.TEXT,
    label: 'City',
@ -99,141 +99,122 @@ export class PersonObjectMetadata extends BaseObjectMetadata {
  })
  city: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.avatarUrl,
    type: FieldMetadataType.TEXT,
    label: 'Avatar',
    description: 'Contact’s avatar',
    icon: 'IconFileUpload',
  })
-  @IsSystem()
+  @WorkspaceIsSystem()
  avatarUrl: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: PERSON_STANDARD_FIELD_IDS.position,
    type: FieldMetadataType.POSITION,
    label: 'Position',
    description: 'Person record Position',
    icon: 'IconHierarchy2',
  })
-  @IsSystem()
-  @IsNullable()
+  @WorkspaceIsSystem()
+  @WorkspaceIsNullable()
  position: number;

  // Relations
-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.company,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Company',
    description: 'Contact’s company',
    icon: 'IconBuildingSkyscraper',
    joinColumn: 'companyId',
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'people',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  company: Relation<CompanyObjectMetadata>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.pointOfContactForOpportunities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'POC for Opportunities',
    description: 'Point of Contact for Opportunities',
    icon: 'IconTargetArrow',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => OpportunityObjectMetadata,
    inverseSideFieldKey: 'pointOfContact',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  pointOfContactForOpportunities: Relation<OpportunityObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.activityTargets,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Activities',
    description: 'Activities tied to the contact',
    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ActivityTargetObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
  activityTargets: Relation<ActivityTargetObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.favorites,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Favorites',
    description: 'Favorites linked to the contact',
    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => FavoriteObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsSystem()
+  @WorkspaceIsSystem()
  favorites: Relation<FavoriteObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.attachments,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Attachments',
    description: 'Attachments linked to the contact.',
    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => AttachmentObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
  attachments: Relation<AttachmentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.messageParticipants,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Message Participants',
    description: 'Message Participants',
    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => MessageParticipantObjectMetadata,
    inverseSideFieldKey: 'person',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsSystem()
+  @WorkspaceIsSystem()
  messageParticipants: Relation<MessageParticipantObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.calendarEventParticipants,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Calendar Event Participants',
    description: 'Calendar Event Participants',
    icon: 'IconCalendar',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CalendarEventParticipantObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsSystem()
+  @WorkspaceIsSystem()
  calendarEventParticipants: Relation<CalendarEventParticipantObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: PERSON_STANDARD_FIELD_IDS.timelineActivities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Events',
    description: 'Events linked to the company',
    icon: 'IconTimelineEvent',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => TimelineActivityObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
-  @IsSystem()
+  @WorkspaceIsNullable()
+  @WorkspaceIsSystem()
  timelineActivities: Relation<TimelineActivityObjectMetadata[]>;
 }
--- a/packages/twenty-server/src/modules/timeline/standard-objects/audit-log.object-metadata.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/audit-log.object-metadata.ts
@ -3,14 +3,16 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { AUDIT_LOGS_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.auditLog,
  namePlural: 'auditLogs',
  labelSingular: 'Audit Log',
@ -18,9 +20,9 @@ import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/stan
  description: 'An audit log of actions performed in the system',
  icon: 'IconIconTimelineEvent',
 })
-@IsSystem()
-export class AuditLogObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+export class AuditLogObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Event name',
@ -29,17 +31,17 @@ export class AuditLogObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.properties,
    type: FieldMetadataType.RAW_JSON,
    label: 'Event details',
    description: 'Json value for event details',
    icon: 'IconListDetails',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  properties: JSON;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.context,
    type: FieldMetadataType.RAW_JSON,
    label: 'Event context',
@ -47,10 +49,10 @@ export class AuditLogObjectMetadata extends BaseObjectMetadata {
      'Json object to provide context (user, device, workspace, etc.)',
    icon: 'IconListDetails',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  context: JSON;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.objectName,
    type: FieldMetadataType.TEXT,
    label: 'Object name',
@ -59,7 +61,7 @@ export class AuditLogObjectMetadata extends BaseObjectMetadata {
  })
  objectName: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.objectName,
    type: FieldMetadataType.TEXT,
    label: 'Object name',
@ -68,24 +70,26 @@ export class AuditLogObjectMetadata extends BaseObjectMetadata {
  })
  objectMetadataId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.recordId,
    type: FieldMetadataType.UUID,
    label: 'Object id',
    description: 'Event name/type',
    icon: 'IconAbc',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  recordId: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: AUDIT_LOGS_STANDARD_FIELD_IDS.workspaceMember,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'Workspace Member',
    description: 'Event workspace member',
    icon: 'IconCircleUser',
    joinColumn: 'workspaceMemberId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'auditLogs',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/timeline/standard-objects/behavioral-event.object-metadata.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/behavioral-event.object-metadata.ts
@ -1,15 +1,15 @@
 import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceGate } from 'src/engine/twenty-orm/decorators/workspace-gate.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
 import { BEHAVIORAL_EVENT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { Gate } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/gate.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.behavioralEvent,
  namePlural: 'behavioralEvents',
  labelSingular: 'Behavioral Event',
@ -17,11 +17,11 @@ import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-
  description: 'An event related to user behavior',
  icon: 'IconIconTimelineEvent',
 })
-@IsSystem()
-@Gate({
+@WorkspaceIsSystem()
+@WorkspaceGate({
  featureFlag: FeatureFlagKeys.IsEventObjectEnabled,
 })
-export class BehavioralEventObjectMetadata extends BaseObjectMetadata {
+export class BehavioralEventObjectMetadata extends BaseWorkspaceEntity {
  /** 
   * 
   * Common in Segment, Rudderstack, etc.
@ -29,7 +29,7 @@ export class BehavioralEventObjectMetadata extends BaseObjectMetadata {
   * But doesn't feel that useful. 
   * Let's try living without it.
   * 
-  @FieldMetadata({
+  @WorkspaceField({
    standardId: behavioralEventStandardFieldIds.type,
    type: FieldMetadataType.TEXT,
    label: 'Event type',
@ -39,7 +39,7 @@ export class BehavioralEventObjectMetadata extends BaseObjectMetadata {
  type: string;
  */

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: BEHAVIORAL_EVENT_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Event name',
@ -48,17 +48,17 @@ export class BehavioralEventObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: BEHAVIORAL_EVENT_STANDARD_FIELD_IDS.properties,
    type: FieldMetadataType.RAW_JSON,
    label: 'Event details',
    description: 'Json value for event details',
    icon: 'IconListDetails',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  properties: JSON;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: BEHAVIORAL_EVENT_STANDARD_FIELD_IDS.context,
    type: FieldMetadataType.RAW_JSON,
    label: 'Event context',
@ -66,10 +66,10 @@ export class BehavioralEventObjectMetadata extends BaseObjectMetadata {
      'Json object to provide context (user, device, workspace, etc.)',
    icon: 'IconListDetails',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  context: JSON;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: BEHAVIORAL_EVENT_STANDARD_FIELD_IDS.objectName,
    type: FieldMetadataType.TEXT,
    label: 'Object name',
@ -78,13 +78,13 @@ export class BehavioralEventObjectMetadata extends BaseObjectMetadata {
  })
  objectName: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: BEHAVIORAL_EVENT_STANDARD_FIELD_IDS.recordId,
    type: FieldMetadataType.UUID,
    label: 'Object id',
    description: 'Event name/type',
    icon: 'IconAbc',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  recordId: string;
 }
--- a/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.object-metadata.ts
+++ b/packages/twenty-server/src/modules/timeline/standard-objects/timeline-activity.object-metadata.ts
@ -3,20 +3,22 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { TIMELINE_ACTIVITY_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { DynamicRelationFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/dynamic-field-metadata.interface';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/company.object-metadata';
 import { OpportunityObjectMetadata } from 'src/modules/opportunity/standard-objects/opportunity.object-metadata';
 import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
 import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
-import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/custom-objects/custom.object-metadata';
+import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceDynamicRelation } from 'src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.timelineActivity,
  namePlural: 'timelineActivities',
  labelSingular: 'Timeline Activity',
@ -24,10 +26,10 @@ import { CustomObjectMetadata } from 'src/engine/workspace-manager/workspace-syn
  description: 'Aggregated / filtered event to be displayed on the timeline',
  icon: 'IconIconTimelineEvent',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class TimelineActivityObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class TimelineActivityObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.happensAt,
    type: FieldMetadataType.DATE_TIME,
    label: 'Creation date',
@ -37,7 +39,7 @@ export class TimelineActivityObjectMetadata extends BaseObjectMetadata {
  })
  happensAt: Date;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Event name',
@ -46,73 +48,18 @@ export class TimelineActivityObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.properties,
    type: FieldMetadataType.RAW_JSON,
    label: 'Event details',
    description: 'Json value for event details',
    icon: 'IconListDetails',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  properties: JSON;

-  // Who made the action
-  @FieldMetadata({
-    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.workspaceMember,
-    type: FieldMetadataType.RELATION,
-    label: 'Workspace Member',
-    description: 'Event workspace member',
-    icon: 'IconCircleUser',
-    joinColumn: 'workspaceMemberId',
-  })
-  @IsNullable()
-  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;
-
-  @FieldMetadata({
-    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.person,
-    type: FieldMetadataType.RELATION,
-    label: 'Person',
-    description: 'Event person',
-    icon: 'IconUser',
-    joinColumn: 'personId',
-  })
-  @IsNullable()
-  person: Relation<PersonObjectMetadata>;
-
-  @FieldMetadata({
-    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.company,
-    type: FieldMetadataType.RELATION,
-    label: 'Company',
-    description: 'Event company',
-    icon: 'IconBuildingSkyscraper',
-    joinColumn: 'companyId',
-  })
-  @IsNullable()
-  company: Relation<CompanyObjectMetadata>;
-
-  @FieldMetadata({
-    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.opportunity,
-    type: FieldMetadataType.RELATION,
-    label: 'Opportunity',
-    description: 'Events opportunity',
-    icon: 'IconTargetArrow',
-    joinColumn: 'opportunityId',
-  })
-  @IsNullable()
-  opportunity: Relation<OpportunityObjectMetadata>;
-
-  @DynamicRelationFieldMetadata((oppositeObjectMetadata) => ({
-    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.custom,
-    name: oppositeObjectMetadata.nameSingular,
-    label: oppositeObjectMetadata.labelSingular,
-    description: `Event ${oppositeObjectMetadata.labelSingular}`,
-    joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
-    icon: 'IconTimeline',
-  }))
-  custom: Relation<CustomObjectMetadata>;
-
  // Special objects that don't have their own timeline and are 'link' to the main object
-  @FieldMetadata({
+  @WorkspaceField({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.linkedRecordCachedName,
    type: FieldMetadataType.TEXT,
    label: 'Linked Record cached name',
@ -121,23 +68,91 @@ export class TimelineActivityObjectMetadata extends BaseObjectMetadata {
  })
  linkedRecordCachedName: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.linkedRecordId,
    type: FieldMetadataType.UUID,
    label: 'Linked Record id',
    description: 'Linked Record id',
    icon: 'IconAbc',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  linkedRecordId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.linkedObjectMetadataId,
    type: FieldMetadataType.UUID,
    label: 'Linked Object Metadata Id',
    description: 'inked Object Metadata Id',
    icon: 'IconAbc',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  linkedObjectMetadataId: string;
+
+  // Who made the action
+  @WorkspaceRelation({
+    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.workspaceMember,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Workspace Member',
+    description: 'Event workspace member',
+    icon: 'IconCircleUser',
+    joinColumn: 'workspaceMemberId',
+    inverseSideTarget: () => WorkspaceMemberObjectMetadata,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  @WorkspaceIsNullable()
+  workspaceMember: Relation<WorkspaceMemberObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.person,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Person',
+    description: 'Event person',
+    icon: 'IconUser',
+    joinColumn: 'personId',
+    inverseSideTarget: () => PersonObjectMetadata,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  @WorkspaceIsNullable()
+  person: Relation<PersonObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.company,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Company',
+    description: 'Event company',
+    icon: 'IconBuildingSkyscraper',
+    joinColumn: 'companyId',
+    inverseSideTarget: () => CompanyObjectMetadata,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  @WorkspaceIsNullable()
+  company: Relation<CompanyObjectMetadata>;
+
+  @WorkspaceRelation({
+    standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.opportunity,
+    type: RelationMetadataType.MANY_TO_ONE,
+    label: 'Opportunity',
+    description: 'Event opportunity',
+    icon: 'IconTargetArrow',
+    joinColumn: 'opportunityId',
+    inverseSideTarget: () => OpportunityObjectMetadata,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  @WorkspaceIsNullable()
+  opportunity: Relation<OpportunityObjectMetadata>;
+
+  @WorkspaceDynamicRelation({
+    type: RelationMetadataType.MANY_TO_ONE,
+    argsFactory: (oppositeObjectMetadata) => ({
+      standardId: TIMELINE_ACTIVITY_STANDARD_FIELD_IDS.custom,
+      name: oppositeObjectMetadata.nameSingular,
+      label: oppositeObjectMetadata.labelSingular,
+      description: `Event ${oppositeObjectMetadata.labelSingular}`,
+      joinColumn: `${oppositeObjectMetadata.nameSingular}Id`,
+      icon: 'IconTimeline',
+    }),
+    inverseSideTarget: () => CustomWorkspaceEntity,
+    inverseSideFieldKey: 'timelineActivities',
+  })
+  custom: Relation<CustomWorkspaceEntity>;
 }
--- a/packages/twenty-server/src/modules/view/standard-objects/view-field.object-metadata.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-field.object-metadata.ts
@ -1,15 +1,17 @@
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
 import { VIEW_FIELD_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.viewField,
  namePlural: 'viewFields',
  labelSingular: 'View Field',
@ -17,10 +19,10 @@ import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.objec
  description: '(System) View Fields',
  icon: 'IconTag',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class ViewFieldObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class ViewFieldObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: VIEW_FIELD_STANDARD_FIELD_IDS.fieldMetadataId,
    type: FieldMetadataType.UUID,
    label: 'Field Metadata Id',
@ -29,7 +31,7 @@ export class ViewFieldObjectMetadata extends BaseObjectMetadata {
  })
  fieldMetadataId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_FIELD_STANDARD_FIELD_IDS.isVisible,
    type: FieldMetadataType.BOOLEAN,
    label: 'Visible',
@ -39,7 +41,7 @@ export class ViewFieldObjectMetadata extends BaseObjectMetadata {
  })
  isVisible: boolean;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_FIELD_STANDARD_FIELD_IDS.size,
    type: FieldMetadataType.NUMBER,
    label: 'Size',
@ -49,7 +51,7 @@ export class ViewFieldObjectMetadata extends BaseObjectMetadata {
  })
  size: number;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_FIELD_STANDARD_FIELD_IDS.position,
    type: FieldMetadataType.NUMBER,
    label: 'Position',
@ -59,14 +61,16 @@ export class ViewFieldObjectMetadata extends BaseObjectMetadata {
  })
  position: number;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: VIEW_FIELD_STANDARD_FIELD_IDS.view,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'View',
    description: 'View Field related view',
    icon: 'IconLayoutCollage',
+    inverseSideTarget: () => ViewObjectMetadata,
+    inverseSideFieldKey: 'viewFields',
    joinColumn: 'viewId',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  view?: ViewObjectMetadata;
 }
--- a/packages/twenty-server/src/modules/view/standard-objects/view-filter.object-metadata.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-filter.object-metadata.ts
@ -3,15 +3,17 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { VIEW_FILTER_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.viewFilter,
  namePlural: 'viewFilters',
  labelSingular: 'View Filter',
@ -19,10 +21,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: '(System) View Filters',
  icon: 'IconFilterBolt',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class ViewFilterObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class ViewFilterObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: VIEW_FILTER_STANDARD_FIELD_IDS.fieldMetadataId,
    type: FieldMetadataType.UUID,
    label: 'Field Metadata Id',
@ -30,7 +32,7 @@ export class ViewFilterObjectMetadata extends BaseObjectMetadata {
  })
  fieldMetadataId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_FILTER_STANDARD_FIELD_IDS.operand,
    type: FieldMetadataType.TEXT,
    label: 'Operand',
@ -39,7 +41,7 @@ export class ViewFilterObjectMetadata extends BaseObjectMetadata {
  })
  operand: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_FILTER_STANDARD_FIELD_IDS.value,
    type: FieldMetadataType.TEXT,
    label: 'Value',
@ -47,7 +49,7 @@ export class ViewFilterObjectMetadata extends BaseObjectMetadata {
  })
  value: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_FILTER_STANDARD_FIELD_IDS.displayValue,
    type: FieldMetadataType.TEXT,
    label: 'Display Value',
@ -55,14 +57,16 @@ export class ViewFilterObjectMetadata extends BaseObjectMetadata {
  })
  displayValue: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: VIEW_FILTER_STANDARD_FIELD_IDS.view,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'View',
    description: 'View Filter related view',
    icon: 'IconLayoutCollage',
    joinColumn: 'viewId',
+    inverseSideTarget: () => ViewObjectMetadata,
+    inverseSideFieldKey: 'viewFilters',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  view: Relation<ViewObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/view/standard-objects/view-sort.object-metadata.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view-sort.object-metadata.ts
@ -3,15 +3,17 @@ import { Relation } from 'src/engine/workspace-manager/workspace-sync-metadata/i
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { VIEW_SORT_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ViewObjectMetadata } from 'src/modules/view/standard-objects/view.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
+import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.viewSort,
  namePlural: 'viewSorts',
  labelSingular: 'View Sort',
@ -19,10 +21,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: '(System) View Sorts',
  icon: 'IconArrowsSort',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class ViewSortObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class ViewSortObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: VIEW_SORT_STANDARD_FIELD_IDS.fieldMetadataId,
    type: FieldMetadataType.UUID,
    label: 'Field Metadata Id',
@ -31,7 +33,7 @@ export class ViewSortObjectMetadata extends BaseObjectMetadata {
  })
  fieldMetadataId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_SORT_STANDARD_FIELD_IDS.direction,
    type: FieldMetadataType.TEXT,
    label: 'Direction',
@ -40,14 +42,16 @@ export class ViewSortObjectMetadata extends BaseObjectMetadata {
  })
  direction: string;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: VIEW_SORT_STANDARD_FIELD_IDS.view,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.MANY_TO_ONE,
    label: 'View',
    description: 'View Sort related view',
    icon: 'IconLayoutCollage',
    joinColumn: 'viewId',
+    inverseSideTarget: () => ViewObjectMetadata,
+    inverseSideFieldKey: 'viewSorts',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  view: Relation<ViewObjectMetadata>;
 }
--- a/packages/twenty-server/src/modules/view/standard-objects/view.object-metadata.ts
+++ b/packages/twenty-server/src/modules/view/standard-objects/view.object-metadata.ts
@ -7,18 +7,18 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { VIEW_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { ViewFieldObjectMetadata } from 'src/modules/view/standard-objects/view-field.object-metadata';
 import { ViewFilterObjectMetadata } from 'src/modules/view/standard-objects/view-filter.object-metadata';
 import { ViewSortObjectMetadata } from 'src/modules/view/standard-objects/view-sort.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.view,
  namePlural: 'views',
  labelSingular: 'View',
@ -26,10 +26,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: '(System) Views',
  icon: 'IconLayoutCollage',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class ViewObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class ViewObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.TEXT,
    label: 'Name',
@ -37,7 +37,7 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
  })
  name: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.objectMetadataId,
    type: FieldMetadataType.UUID,
    label: 'Object Metadata Id',
@ -45,7 +45,7 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
  })
  objectMetadataId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.type,
    type: FieldMetadataType.TEXT,
    label: 'Type',
@ -54,7 +54,7 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
  })
  type: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.key,
    type: FieldMetadataType.SELECT,
    label: 'Key',
@ -62,10 +62,10 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
    options: [{ value: 'INDEX', label: 'Index', position: 0, color: 'red' }],
    defaultValue: "'INDEX'",
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  key: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.icon,
    type: FieldMetadataType.TEXT,
    label: 'Icon',
@ -73,7 +73,7 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
  })
  icon: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.kanbanFieldMetadataId,
    type: FieldMetadataType.TEXT,
    label: 'kanbanfieldMetadataId',
@ -81,16 +81,16 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
  })
  kanbanFieldMetadataId: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.position,
    type: FieldMetadataType.POSITION,
    label: 'Position',
    description: 'View position',
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  position: number;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: VIEW_STANDARD_FIELD_IDS.isCompact,
    type: FieldMetadataType.BOOLEAN,
    label: 'Compact View',
@ -99,48 +99,39 @@ export class ViewObjectMetadata extends BaseObjectMetadata {
  })
  isCompact: boolean;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: VIEW_STANDARD_FIELD_IDS.viewFields,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'View Fields',
    description: 'View Fields',
    icon: 'IconTag',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ViewFieldObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  viewFields: Relation<ViewFieldObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: VIEW_STANDARD_FIELD_IDS.viewFilters,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'View Filters',
    description: 'View Filters',
    icon: 'IconFilterBolt',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ViewFilterObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  viewFilters: Relation<ViewFilterObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: VIEW_STANDARD_FIELD_IDS.viewSorts,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'View Sorts',
    description: 'View Sorts',
    icon: 'IconArrowsSort',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ViewSortObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
+  @WorkspaceIsNullable()
  viewSorts: Relation<ViewSortObjectMetadata[]>;
 }
--- a/packages/twenty-server/src/modules/webhook/standard-objects/webhook.object-metadata.ts
+++ b/packages/twenty-server/src/modules/webhook/standard-objects/webhook.object-metadata.ts
@ -1,13 +1,13 @@
 import { FieldMetadataType } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
 import { WEBHOOK_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.webhook,
  namePlural: 'webhooks',
  labelSingular: 'Webhook',
@ -15,10 +15,10 @@ import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-
  description: 'A webhook',
  icon: 'IconRobot',
 })
-@IsNotAuditLogged()
-@IsSystem()
-export class WebhookObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsNotAuditLogged()
+@WorkspaceIsSystem()
+export class WebhookObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: WEBHOOK_STANDARD_FIELD_IDS.targetUrl,
    type: FieldMetadataType.TEXT,
    label: 'Target Url',
@ -27,7 +27,7 @@ export class WebhookObjectMetadata extends BaseObjectMetadata {
  })
  targetUrl: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: WEBHOOK_STANDARD_FIELD_IDS.operation,
    type: FieldMetadataType.TEXT,
    label: 'Operation',
--- a/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.object-metadata.ts
+++ b/packages/twenty-server/src/modules/workspace-member/standard-objects/workspace-member.object-metadata.ts
@ -8,13 +8,8 @@ import {
 } from 'src/engine/metadata-modules/relation-metadata/relation-metadata.entity';
 import { WORKSPACE_MEMBER_STANDARD_FIELD_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-field-ids';
 import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-import { FieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/field-metadata.decorator';
-import { IsSystem } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-system.decorator';
-import { ObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/object-metadata.decorator';
-import { RelationMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/relation-metadata.decorator';
 import { ActivityObjectMetadata } from 'src/modules/activity/standard-objects/activity.object-metadata';
 import { AttachmentObjectMetadata } from 'src/modules/attachment/standard-objects/attachment.object-metadata';
-import { BaseObjectMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects/base.object-metadata';
 import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
 import { CalendarEventParticipantObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-participant.object-metadata';
 import { CommentObjectMetadata } from 'src/modules/activity/standard-objects/comment.object-metadata';
@ -22,12 +17,17 @@ import { CompanyObjectMetadata } from 'src/modules/company/standard-objects/comp
 import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
 import { FavoriteObjectMetadata } from 'src/modules/favorite/standard-objects/favorite.object-metadata';
 import { MessageParticipantObjectMetadata } from 'src/modules/messaging/standard-objects/message-participant.object-metadata';
-import { IsNullable } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-nullable.decorator';
 import { TimelineActivityObjectMetadata } from 'src/modules/timeline/standard-objects/timeline-activity.object-metadata';
 import { AuditLogObjectMetadata } from 'src/modules/timeline/standard-objects/audit-log.object-metadata';
-import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-metadata/decorators/is-not-audit-logged.decorator';
+import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
+import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-object.decorator';
+import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
+import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
+import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
+import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';

-@ObjectMetadata({
+@WorkspaceEntity({
  standardId: STANDARD_OBJECT_IDS.workspaceMember,
  namePlural: 'workspaceMembers',
  labelSingular: 'Workspace Member',
@ -35,10 +35,10 @@ import { IsNotAuditLogged } from 'src/engine/workspace-manager/workspace-sync-me
  description: 'A workspace member',
  icon: 'IconUserCircle',
 })
-@IsSystem()
-@IsNotAuditLogged()
-export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
-  @FieldMetadata({
+@WorkspaceIsSystem()
+@WorkspaceIsNotAuditLogged()
+export class WorkspaceMemberObjectMetadata extends BaseWorkspaceEntity {
+  @WorkspaceField({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.name,
    type: FieldMetadataType.FULL_NAME,
    label: 'Name',
@ -47,7 +47,7 @@ export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
  })
  name: FullNameMetadata;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.colorScheme,
    type: FieldMetadataType.TEXT,
    label: 'Color Scheme',
@ -57,7 +57,7 @@ export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
  })
  colorScheme: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.locale,
    type: FieldMetadataType.TEXT,
    label: 'Language',
@ -67,7 +67,7 @@ export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
  })
  locale: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.avatarUrl,
    type: FieldMetadataType.TEXT,
    label: 'Avatar Url',
@ -76,7 +76,7 @@ export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
  })
  avatarUrl: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.userEmail,
    type: FieldMetadataType.TEXT,
    label: 'User Email',
@ -85,7 +85,7 @@ export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
  })
  userEmail: string;

-  @FieldMetadata({
+  @WorkspaceField({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.userId,
    type: FieldMetadataType.UUID,
    label: 'User Id',
@ -95,184 +95,148 @@ export class WorkspaceMemberObjectMetadata extends BaseObjectMetadata {
  userId: string;

  // Relations
-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.authoredActivities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Authored activities',
    description: 'Activities created by the workspace member',
    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ActivityObjectMetadata,
    inverseSideFieldKey: 'author',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  authoredActivities: Relation<ActivityObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.assignedActivities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Assigned activities',
    description: 'Activities assigned to the workspace member',
    icon: 'IconCheckbox',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ActivityObjectMetadata,
    inverseSideFieldKey: 'assignee',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  assignedActivities: Relation<ActivityObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.favorites,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Favorites',
    description: 'Favorites linked to the workspace member',
    icon: 'IconHeart',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => FavoriteObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
  favorites: Relation<FavoriteObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.accountOwnerForCompanies,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Account Owner For Companies',
    description: 'Account owner for companies',
    icon: 'IconBriefcase',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CompanyObjectMetadata,
    inverseSideFieldKey: 'accountOwner',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  accountOwnerForCompanies: Relation<CompanyObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.authoredAttachments,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Authored attachments',
    description: 'Attachments created by the workspace member',
    icon: 'IconFileImport',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => AttachmentObjectMetadata,
    inverseSideFieldKey: 'author',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  authoredAttachments: Relation<AttachmentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.authoredComments,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Authored comments',
    description: 'Authored comments',
    icon: 'IconComment',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CommentObjectMetadata,
    inverseSideFieldKey: 'author',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  authoredComments: Relation<CommentObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.connectedAccounts,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Connected accounts',
    description: 'Connected accounts',
    icon: 'IconAt',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => ConnectedAccountObjectMetadata,
    inverseSideFieldKey: 'accountOwner',
    onDelete: RelationOnDeleteAction.CASCADE,
  })
  connectedAccounts: Relation<ConnectedAccountObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.messageParticipants,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Message Participants',
    description: 'Message Participants',
    icon: 'IconUserCircle',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => MessageParticipantObjectMetadata,
    inverseSideFieldKey: 'workspaceMember',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  messageParticipants: Relation<MessageParticipantObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.blocklist,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Blocklist',
    description: 'Blocklisted handles',
    icon: 'IconForbid2',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => BlocklistObjectMetadata,
    inverseSideFieldKey: 'workspaceMember',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  blocklist: Relation<BlocklistObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.calendarEventParticipants,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Calendar Event Participants',
    description: 'Calendar Event Participants',
    icon: 'IconCalendar',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => CalendarEventParticipantObjectMetadata,
    inverseSideFieldKey: 'workspaceMember',
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
  calendarEventParticipants: Relation<CalendarEventParticipantObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.timelineActivities,
-    type: FieldMetadataType.RELATION,
+    type: RelationMetadataType.ONE_TO_MANY,
    label: 'Events',
    description: 'Events linked to the workspace member',
    icon: 'IconTimelineEvent',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => TimelineActivityObjectMetadata,
    onDelete: RelationOnDeleteAction.CASCADE,
  })
-  @IsNullable()
-  @IsSystem()
+  @WorkspaceIsNullable()
+  @WorkspaceIsSystem()
  timelineActivities: Relation<TimelineActivityObjectMetadata[]>;

-  @FieldMetadata({
+  @WorkspaceRelation({
    standardId: WORKSPACE_MEMBER_STANDARD_FIELD_IDS.auditLogs,
-    type: FieldMetadataType.RELATION,
-    label: 'Aud tLogs',
+    type: RelationMetadataType.ONE_TO_MANY,
+    label: 'Audit Logs',
    description: 'Audit Logs linked to the workspace member',
    icon: 'IconTimelineEvent',
-  })
-  @RelationMetadata({
-    type: RelationMetadataType.ONE_TO_MANY,
    inverseSideTarget: () => AuditLogObjectMetadata,
    onDelete: RelationOnDeleteAction.SET_NULL,
  })
-  @IsNullable()
-  @IsSystem()
+  @WorkspaceIsNullable()
+  @WorkspaceIsSystem()
  auditLogs: Relation<AuditLogObjectMetadata[]>;
 }