amsdal_crm 0.1.10__py3-none-any.whl → 0.2.1__py3-none-any.whl

amsdal_crm/migrations/0000_initial.py

@@ -4,45 +4,12 @@ from amsdal_utils.models.enums import ModuleType
 
 class Migration(migrations.Migration):
     operations: list[migrations.Operation] = [
-        migrations.CreateClass(
-            module_type=ModuleType.CONTRIB,
-            class_name="Account",
-            new_schema={
-                "title": "Account",
-                "required": ["name", "owner_email"],
-                "properties": {
-                    "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
-                    "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
-                    "name": {"type": "string", "title": "Account Name"},
-                    "website": {"type": "string", "title": "Website"},
-                    "phone": {"type": "string", "title": "Phone"},
-                    "industry": {"type": "string", "title": "Industry"},
-                    "billing_street": {"type": "string", "title": "Billing Street"},
-                    "billing_city": {"type": "string", "title": "Billing City"},
-                    "billing_state": {"type": "string", "title": "Billing State"},
-                    "billing_postal_code": {"type": "string", "title": "Billing Postal Code"},
-                    "billing_country": {"type": "string", "title": "Billing Country"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
-                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
-                },
-                "custom_code": 'from amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    """Return display name for the account."""\n    return self.name\n\nasync def apost_update(self) -> None:\n    """Async hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules(\'Account\', \'update\', self)\n\nasync def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Account\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Account\', self.custom_fields)\n    await super().apre_update()\n\ndef has_object_permission(self, user: \'User\', action: str) -> bool:\n    """Check if user has permission to perform action on this account.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        """\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == \'*\' and permission.action in (\'*\', action):\n                return True\n            if permission.model == \'Account\' and permission.action in (\'*\', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    """Hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules(\'Account\', \'update\', self)\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Account\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Account\', self.custom_fields)\n    super().pre_update()',
-                "storage_metadata": {
-                    "table_name": "Account",
-                    "db_fields": {},
-                    "primary_key": ["partition_key"],
-                    "indexed": [["owner_email"], ["created_at"]],
-                    "unique": [["name", "owner_email"]],
-                    "foreign_keys": {},
-                },
-                "description": "Account (Company/Organization) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
-            },
-        ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
             class_name="Activity",
             new_schema={
                 "title": "Activity",
-                "required": ["activity_type", "subject", "related_to_type", "related_to_id", "owner_email"],
+                "required": ["activity_type", "subject"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
@@ -63,89 +30,113 @@ class Migration(migrations.Migration):
                     "subject": {"type": "string", "title": "Subject"},
                     "description": {"type": "string", "title": "Description"},
                     "related_to_type": {
-                        "type": "ActivityRelatedTo",
-                        "options": [
-                            {"key": "CONTACT", "value": "Contact"},
-                            {"key": "ACCOUNT", "value": "Account"},
-                            {"key": "DEAL", "value": "Deal"},
-                        ],
-                        "title": "ActivityRelatedTo",
+                        "type": "string",
+                        "options": [{"key": "ENTITY", "value": "Entity"}, {"key": "DEAL", "value": "Deal"}],
+                        "title": "Related To Type",
                         "description": "What type of record this activity is related to.",
-                        "enum": ["Contact", "Account", "Deal"],
-                        "x_enum_names": ["CONTACT", "ACCOUNT", "DEAL"],
+                        "enum": ["Entity", "Deal"],
+                        "x_enum_names": ["ENTITY", "DEAL"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "due_date": {"type": "datetime", "title": "Due Date", "format": "date-time"},
                     "completed_at": {"type": "datetime", "title": "Completed At", "format": "date-time"},
                     "is_completed": {"type": "boolean", "default": False, "title": "Is Completed"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Activity",
-                    "db_fields": {},
+                    "db_fields": {"assigned_to": ["assigned_to_partition_key"]},
                     "primary_key": ["partition_key"],
-                    "indexed": [["related_to_id"], ["owner_email"], ["created_at"], ["due_date"]],
-                    "foreign_keys": {},
+                    "indexed": [["related_to_id"], ["created_at"], ["due_date"]],
+                    "foreign_keys": {
+                        "assigned_to": [{"assigned_to_partition_key": "string"}, "User", ["partition_key"]]
+                    },
                 },
                 "description": "Base activity model with polymorphic related_to field.\n\nActivities can be linked to Contacts, Accounts, or Deals using\na generic foreign key pattern (related_to_type + related_to_id).",
             },
         ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
-            class_name="Pipeline",
+            class_name="Entity",
             new_schema={
-                "title": "Pipeline",
+                "title": "Entity",
                 "required": ["name"],
                 "properties": {
-                    "name": {"type": "string", "title": "Pipeline Name"},
-                    "description": {"type": "string", "title": "Description"},
-                    "is_active": {"type": "boolean", "default": True, "title": "Is Active"},
+                    "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
+                    "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "name": {"type": "string", "title": "Entity Name"},
+                    "legal_name": {"type": "string", "title": "Legal Name"},
+                    "status": {
+                        "type": "string",
+                        "default": "Active",
+                        "options": [{"key": "Active", "value": "Active"}, {"key": "Inactive", "value": "Inactive"}],
+                        "title": "Status",
+                        "enum": ["Active", "Inactive"],
+                    },
+                    "note": {"type": "string", "title": "Note"},
+                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                 },
-                "custom_code": '@property\ndef display_name(self) -> str:\n    """Return display name for the pipeline."""\n    return self.name',
+                "custom_code": 'from amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    """Return display name for the account."""\n    return self.name\n\nasync def apost_update(self) -> None:\n    """Async hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules(\'Entity\', \'update\', self)\n\nasync def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Entity\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Entity\', self.custom_fields)\n    await super().apre_update()\n\ndef has_object_permission(self, user: \'User\', action: str) -> bool:\n    """Check if user has permission to perform action on this account.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        """\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == \'*\' and permission.action in (\'*\', action):\n                return True\n            if permission.model == \'Entity\' and permission.action in (\'*\', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    """Hook called after updating account."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules(\'Entity\', \'update\', self)\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Entity\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Entity\', self.custom_fields)\n    super().pre_update()',
                 "storage_metadata": {
-                    "table_name": "Pipeline",
-                    "db_fields": {},
+                    "table_name": "Entity",
+                    "db_fields": {"assigned_to": ["assigned_to_partition_key"]},
                     "primary_key": ["partition_key"],
+                    "indexed": [["created_at"]],
                     "unique": [["name"]],
-                    "foreign_keys": {},
+                    "foreign_keys": {
+                        "assigned_to": [{"assigned_to_partition_key": "string"}, "User", ["partition_key"]]
+                    },
                 },
-                "description": "Sales pipeline model.\n\nRepresents a sales pipeline with multiple stages.\nPipelines are system-wide and not owned by individual users.",
+                "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
             },
         ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
-            class_name="Contact",
+            class_name="EntityAddress",
             new_schema={
-                "title": "Contact",
-                "required": ["first_name", "last_name", "email", "owner_email"],
+                "title": "EntityAddress",
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
-                    "first_name": {"type": "string", "title": "First Name"},
-                    "last_name": {"type": "string", "title": "Last Name"},
-                    "email": {"type": "string", "title": "Email"},
-                    "phone": {"type": "string", "title": "Phone Number"},
-                    "mobile": {"type": "string", "title": "Mobile Number"},
-                    "title": {"type": "string", "title": "Job Title"},
-                    "account": {
-                        "type": "Account",
-                        "title": "Account",
-                        "description": "Account (Company/Organization) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
-                    },
-                    "owner_email": {"type": "string", "title": "Owner Email"},
-                    "custom_fields": {"type": "anything", "title": "Custom Fields"},
+                    "line1": {"type": "string", "title": "Address Line 1"},
+                    "line2": {"type": "string", "title": "Address Line 2"},
+                    "city": {"type": "string", "title": "City"},
+                    "region": {"type": "string", "title": "Region/State"},
+                    "postal_code": {"type": "string", "title": "Postal Code"},
+                    "country": {"type": "string", "title": "Country"},
+                    "is_primary": {"type": "boolean", "default": False, "title": "Is Primary"},
+                },
+                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityAddress\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityAddress\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityAddress\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityAddress\', self.custom_fields)\n    super().pre_update()',
+                "storage_metadata": {
+                    "table_name": "EntityAddress",
+                    "db_fields": {},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {},
+                },
+            },
+        ),
+        migrations.CreateClass(
+            module_type=ModuleType.CONTRIB,
+            class_name="Pipeline",
+            new_schema={
+                "title": "Pipeline",
+                "required": ["name"],
+                "properties": {
+                    "name": {"type": "string", "title": "Pipeline Name"},
+                    "description": {"type": "string", "title": "Description"},
+                    "is_active": {"type": "boolean", "default": True, "title": "Is Active"},
                 },
-                "custom_code": 'from amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    """Return display name for the contact."""\n    return f\'{self.first_name} {self.last_name}\'\n\n@property\ndef full_name(self) -> str:\n    """Return full name of the contact."""\n    return f\'{self.first_name} {self.last_name}\'\n\nasync def apost_update(self) -> None:\n    """Async hook called after updating contact."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules(\'Contact\', \'update\', self)\n\nasync def apre_create(self) -> None:\n    """Async hook called before creating contact."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Contact\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating contact."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Contact\', self.custom_fields)\n    await super().apre_update()\n\ndef has_object_permission(self, user: \'User\', action: str) -> bool:\n    """Check if user has permission to perform action on this contact.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        """\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == \'*\' and permission.action in (\'*\', action):\n                return True\n            if permission.model == \'Contact\' and permission.action in (\'*\', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    """Hook called after updating contact."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules(\'Contact\', \'update\', self)\n\ndef pre_create(self) -> None:\n    """Hook called before creating contact."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Contact\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating contact."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Contact\', self.custom_fields)\n    super().pre_update()',
+                "custom_code": '@property\ndef display_name(self) -> str:\n    """Return display name for the pipeline."""\n    return self.name',
                 "storage_metadata": {
-                    "table_name": "Contact",
-                    "db_fields": {"account": ["account_partition_key"]},
+                    "table_name": "Pipeline",
+                    "db_fields": {},
                     "primary_key": ["partition_key"],
-                    "indexed": [["owner_email"], ["created_at"]],
-                    "unique": [["email"]],
-                    "foreign_keys": {"account": [{"account_partition_key": "string"}, "Account", ["partition_key"]]},
+                    "unique": [["name"]],
+                    "foreign_keys": {},
                 },
-                "description": "Contact (Person) model.\n\nRepresents a person in the CRM system, optionally linked to an Account.\nOwned by individual users with permission controls.",
+                "description": "Sales pipeline model.\n\nRepresents a sales pipeline with multiple stages.\nPipelines are system-wide and not owned by individual users.",
             },
         ),
         migrations.CreateClass(
@@ -154,7 +145,7 @@ class Migration(migrations.Migration):
             new_schema={
                 "title": "Call",
                 "type": "Activity",
-                "required": ["subject", "related_to_type", "related_to_id", "owner_email", "phone_number"],
+                "required": ["subject", "phone_number"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
@@ -162,32 +153,28 @@ class Migration(migrations.Migration):
                     "subject": {"type": "string", "title": "Subject"},
                     "description": {"type": "string", "title": "Description"},
                     "related_to_type": {
-                        "type": "ActivityRelatedTo",
-                        "options": [
-                            {"key": "CONTACT", "value": "Contact"},
-                            {"key": "ACCOUNT", "value": "Account"},
-                            {"key": "DEAL", "value": "Deal"},
-                        ],
-                        "title": "ActivityRelatedTo",
+                        "type": "string",
+                        "options": [{"key": "ENTITY", "value": "Entity"}, {"key": "DEAL", "value": "Deal"}],
+                        "title": "Related To Type",
                         "description": "What type of record this activity is related to.",
-                        "enum": ["Contact", "Account", "Deal"],
-                        "x_enum_names": ["CONTACT", "ACCOUNT", "DEAL"],
+                        "enum": ["Entity", "Deal"],
+                        "x_enum_names": ["ENTITY", "DEAL"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "due_date": {"type": "datetime", "title": "Due Date", "format": "date-time"},
                     "completed_at": {"type": "datetime", "title": "Completed At", "format": "date-time"},
                     "is_completed": {"type": "boolean", "default": False, "title": "Is Completed"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                     "phone_number": {"type": "string", "title": "Phone Number"},
                     "duration_seconds": {"type": "integer", "title": "Duration (seconds)"},
                     "call_outcome": {"type": "string", "title": "Call Outcome"},
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Call",
                     "db_fields": {},
                     "primary_key": ["partition_key"],
-                    "indexed": [["related_to_id"], ["owner_email"], ["created_at"], ["due_date"]],
+                    "indexed": [["related_to_id"], ["created_at"], ["due_date"]],
                     "foreign_keys": {},
                 },
                 "description": "Phone call activity.",
@@ -199,15 +186,7 @@ class Migration(migrations.Migration):
             new_schema={
                 "title": "EmailActivity",
                 "type": "Activity",
-                "required": [
-                    "subject",
-                    "related_to_type",
-                    "related_to_id",
-                    "owner_email",
-                    "from_address",
-                    "to_addresses",
-                    "body",
-                ],
+                "required": ["subject", "from_address", "to_addresses", "body"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
@@ -215,34 +194,30 @@ class Migration(migrations.Migration):
                     "subject": {"type": "string", "title": "Subject"},
                     "description": {"type": "string", "title": "Description"},
                     "related_to_type": {
-                        "type": "ActivityRelatedTo",
-                        "options": [
-                            {"key": "CONTACT", "value": "Contact"},
-                            {"key": "ACCOUNT", "value": "Account"},
-                            {"key": "DEAL", "value": "Deal"},
-                        ],
-                        "title": "ActivityRelatedTo",
+                        "type": "string",
+                        "options": [{"key": "ENTITY", "value": "Entity"}, {"key": "DEAL", "value": "Deal"}],
+                        "title": "Related To Type",
                         "description": "What type of record this activity is related to.",
-                        "enum": ["Contact", "Account", "Deal"],
-                        "x_enum_names": ["CONTACT", "ACCOUNT", "DEAL"],
+                        "enum": ["Entity", "Deal"],
+                        "x_enum_names": ["ENTITY", "DEAL"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "due_date": {"type": "datetime", "title": "Due Date", "format": "date-time"},
                     "completed_at": {"type": "datetime", "title": "Completed At", "format": "date-time"},
                     "is_completed": {"type": "boolean", "default": False, "title": "Is Completed"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                     "from_address": {"type": "string", "title": "From Address"},
                     "to_addresses": {"type": "array", "items": {"type": "string"}, "title": "To Addresses"},
                     "cc_addresses": {"type": "array", "items": {"type": "string"}, "title": "CC Addresses"},
                     "body": {"type": "string", "title": "Email Body"},
                     "is_outbound": {"type": "boolean", "default": True, "title": "Is Outbound"},
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "EmailActivity",
                     "db_fields": {},
                     "primary_key": ["partition_key"],
-                    "indexed": [["related_to_id"], ["owner_email"], ["created_at"], ["due_date"]],
+                    "indexed": [["related_to_id"], ["created_at"], ["due_date"]],
                     "foreign_keys": {},
                 },
                 "description": "Email activity with sender/recipients.",
@@ -254,7 +229,7 @@ class Migration(migrations.Migration):
             new_schema={
                 "title": "Event",
                 "type": "Activity",
-                "required": ["subject", "related_to_type", "related_to_id", "owner_email", "start_time", "end_time"],
+                "required": ["subject", "start_time", "end_time"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
@@ -262,32 +237,28 @@ class Migration(migrations.Migration):
                     "subject": {"type": "string", "title": "Subject"},
                     "description": {"type": "string", "title": "Description"},
                     "related_to_type": {
-                        "type": "ActivityRelatedTo",
-                        "options": [
-                            {"key": "CONTACT", "value": "Contact"},
-                            {"key": "ACCOUNT", "value": "Account"},
-                            {"key": "DEAL", "value": "Deal"},
-                        ],
-                        "title": "ActivityRelatedTo",
+                        "type": "string",
+                        "options": [{"key": "ENTITY", "value": "Entity"}, {"key": "DEAL", "value": "Deal"}],
+                        "title": "Related To Type",
                         "description": "What type of record this activity is related to.",
-                        "enum": ["Contact", "Account", "Deal"],
-                        "x_enum_names": ["CONTACT", "ACCOUNT", "DEAL"],
+                        "enum": ["Entity", "Deal"],
+                        "x_enum_names": ["ENTITY", "DEAL"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "due_date": {"type": "datetime", "title": "Due Date", "format": "date-time"},
                     "completed_at": {"type": "datetime", "title": "Completed At", "format": "date-time"},
                     "is_completed": {"type": "boolean", "default": False, "title": "Is Completed"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                     "start_time": {"type": "datetime", "title": "Start Time", "format": "date-time"},
                     "end_time": {"type": "datetime", "title": "End Time", "format": "date-time"},
                     "location": {"type": "string", "title": "Location"},
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Event",
                     "db_fields": {},
                     "primary_key": ["partition_key"],
-                    "indexed": [["related_to_id"], ["owner_email"], ["created_at"], ["due_date"]],
+                    "indexed": [["related_to_id"], ["created_at"], ["due_date"]],
                     "foreign_keys": {},
                 },
                 "description": "Event/meeting activity with start/end times.",
@@ -299,7 +270,7 @@ class Migration(migrations.Migration):
             new_schema={
                 "title": "Note",
                 "type": "Activity",
-                "required": ["subject", "related_to_type", "related_to_id", "owner_email"],
+                "required": ["subject"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
@@ -307,29 +278,25 @@ class Migration(migrations.Migration):
                     "subject": {"type": "string", "title": "Subject"},
                     "description": {"type": "string", "title": "Description"},
                     "related_to_type": {
-                        "type": "ActivityRelatedTo",
-                        "options": [
-                            {"key": "CONTACT", "value": "Contact"},
-                            {"key": "ACCOUNT", "value": "Account"},
-                            {"key": "DEAL", "value": "Deal"},
-                        ],
-                        "title": "ActivityRelatedTo",
+                        "type": "string",
+                        "options": [{"key": "ENTITY", "value": "Entity"}, {"key": "DEAL", "value": "Deal"}],
+                        "title": "Related To Type",
                         "description": "What type of record this activity is related to.",
-                        "enum": ["Contact", "Account", "Deal"],
-                        "x_enum_names": ["CONTACT", "ACCOUNT", "DEAL"],
+                        "enum": ["Entity", "Deal"],
+                        "x_enum_names": ["ENTITY", "DEAL"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "due_date": {"type": "datetime", "title": "Due Date", "format": "date-time"},
                     "completed_at": {"type": "datetime", "title": "Completed At", "format": "date-time"},
                     "is_completed": {"type": "boolean", "default": False, "title": "Is Completed"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Note",
                     "db_fields": {},
                     "primary_key": ["partition_key"],
-                    "indexed": [["related_to_id"], ["owner_email"], ["created_at"], ["due_date"]],
+                    "indexed": [["related_to_id"], ["created_at"], ["due_date"]],
                     "foreign_keys": {},
                 },
                 "description": "Simple note activity.",
@@ -341,7 +308,7 @@ class Migration(migrations.Migration):
             new_schema={
                 "title": "Task",
                 "type": "Activity",
-                "required": ["subject", "related_to_type", "related_to_id", "owner_email"],
+                "required": ["subject"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
@@ -349,22 +316,18 @@ class Migration(migrations.Migration):
                     "subject": {"type": "string", "title": "Subject"},
                     "description": {"type": "string", "title": "Description"},
                     "related_to_type": {
-                        "type": "ActivityRelatedTo",
-                        "options": [
-                            {"key": "CONTACT", "value": "Contact"},
-                            {"key": "ACCOUNT", "value": "Account"},
-                            {"key": "DEAL", "value": "Deal"},
-                        ],
-                        "title": "ActivityRelatedTo",
+                        "type": "string",
+                        "options": [{"key": "ENTITY", "value": "Entity"}, {"key": "DEAL", "value": "Deal"}],
+                        "title": "Related To Type",
                         "description": "What type of record this activity is related to.",
-                        "enum": ["Contact", "Account", "Deal"],
-                        "x_enum_names": ["CONTACT", "ACCOUNT", "DEAL"],
+                        "enum": ["Entity", "Deal"],
+                        "x_enum_names": ["ENTITY", "DEAL"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "due_date": {"type": "datetime", "title": "Due Date", "format": "date-time"},
                     "completed_at": {"type": "datetime", "title": "Completed At", "format": "date-time"},
                     "is_completed": {"type": "boolean", "default": False, "title": "Is Completed"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                     "priority": {
                         "type": "string",
                         "default": "medium",
@@ -389,17 +352,109 @@ class Migration(migrations.Migration):
                         "enum": ["not_started", "in_progress", "waiting", "completed"],
                     },
                 },
-                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the activity.\"\"\"\n    return f'{self.activity_type.value}: {self.subject}'\n\nasync def apre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = await self.aget_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this activity.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Activity' and permission.action in ('*', action):\n                return True\n    return False\n\ndef pre_create(self) -> None:\n    self.created_at = _dt.datetime.now(tz=_dt.UTC)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    self.updated_at = _dt.datetime.now(tz=_dt.UTC)\n    if not self.created_at:\n        _metadata = self.get_metadata()\n        self.created_at = _dt.datetime.fromtimestamp(_metadata.created_at / 1000, tz=_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Task",
                     "db_fields": {},
                     "primary_key": ["partition_key"],
-                    "indexed": [["related_to_id"], ["owner_email"], ["created_at"], ["due_date"]],
+                    "indexed": [["related_to_id"], ["created_at"], ["due_date"]],
                     "foreign_keys": {},
                 },
                 "description": "Task activity with priority and status.",
             },
         ),
+        migrations.CreateClass(
+            module_type=ModuleType.CONTRIB,
+            class_name="EntityContactPoint",
+            new_schema={
+                "title": "EntityContactPoint",
+                "required": ["value", "entity"],
+                "properties": {
+                    "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
+                    "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "value": {"type": "string", "title": "Contact Point Value"},
+                    "is_primary": {"type": "boolean", "default": False, "title": "Is Primary"},
+                    "can_contact": {"type": "boolean", "default": True, "title": "Can Contact"},
+                    "entity": {
+                        "type": "Entity",
+                        "title": "Entity",
+                        "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
+                    },
+                },
+                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityContactPoint\', self.custom_fields)\n    super().pre_update()',
+                "storage_metadata": {
+                    "table_name": "EntityContactPoint",
+                    "db_fields": {"entity": ["entity_partition_key"]},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {"entity": [{"entity_partition_key": "string"}, "Entity", ["partition_key"]]},
+                },
+            },
+        ),
+        migrations.CreateClass(
+            module_type=ModuleType.CONTRIB,
+            class_name="EntityIdentifier",
+            new_schema={
+                "title": "EntityIdentifier",
+                "required": ["value", "entity"],
+                "properties": {
+                    "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
+                    "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "value": {"type": "string", "title": "Identifier Value"},
+                    "country": {"type": "string", "title": "Country"},
+                    "is_primary": {"type": "boolean", "default": False, "title": "Is Primary"},
+                    "entity": {
+                        "type": "Entity",
+                        "title": "Entity",
+                        "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
+                    },
+                },
+                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityIdentifier\', self.custom_fields)\n    super().pre_update()',
+                "storage_metadata": {
+                    "table_name": "EntityIdentifier",
+                    "db_fields": {"entity": ["entity_partition_key"]},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {"entity": [{"entity_partition_key": "string"}, "Entity", ["partition_key"]]},
+                },
+            },
+        ),
+        migrations.CreateClass(
+            module_type=ModuleType.CONTRIB,
+            class_name="EntityRelationship",
+            new_schema={
+                "title": "EntityRelationship",
+                "required": ["from_entity", "to_entity"],
+                "properties": {
+                    "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
+                    "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
+                    "start_date": {"type": "string", "title": "Start Date"},
+                    "end_date": {"type": "string", "title": "End Date"},
+                    "relationship_group_name": {"type": "string", "title": "Relationship Group Name"},
+                    "from_entity": {
+                        "type": "Entity",
+                        "title": "From Entity",
+                        "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
+                    },
+                    "to_entity": {
+                        "type": "Entity",
+                        "title": "To Entity",
+                        "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
+                    },
+                },
+                "custom_code": 'async def apre_create(self) -> None:\n    """Async hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityRelationship\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'EntityRelationship\', self.custom_fields)\n        await super().apre_update()\n\ndef pre_create(self) -> None:\n    """Hook called before creating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityRelationship\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating account."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'EntityRelationship\', self.custom_fields)\n    super().pre_update()',
+                "storage_metadata": {
+                    "table_name": "EntityRelationship",
+                    "db_fields": {
+                        "from_entity": ["from_entity_partition_key"],
+                        "to_entity": ["to_entity_partition_key"],
+                    },
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {
+                        "from_entity": [{"from_entity_partition_key": "string"}, "Entity", ["partition_key"]],
+                        "to_entity": [{"to_entity_partition_key": "string"}, "Entity", ["partition_key"]],
+                    },
+                },
+            },
+        ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
             class_name="Stage",
@@ -413,6 +468,7 @@ class Migration(migrations.Migration):
                         "description": "Sales pipeline model.\n\nRepresents a sales pipeline with multiple stages.\nPipelines are system-wide and not owned by individual users.",
                     },
                     "name": {"type": "string", "title": "Stage Name"},
+                    "description": {"type": "string", "title": "Description"},
                     "order": {"type": "integer", "title": "Order"},
                     "probability": {
                         "type": "number",
@@ -421,8 +477,17 @@ class Migration(migrations.Migration):
                         "maximum": 100,
                         "minimum": 0,
                     },
-                    "is_closed_won": {"type": "boolean", "default": False, "title": "Is Closed Won"},
-                    "is_closed_lost": {"type": "boolean", "default": False, "title": "Is Closed Lost"},
+                    "status": {
+                        "type": "string",
+                        "default": "open",
+                        "options": [
+                            {"key": "open", "value": "open"},
+                            {"key": "closed_won", "value": "closed_won"},
+                            {"key": "closed_lost", "value": "closed_lost"},
+                        ],
+                        "title": "Status",
+                        "enum": ["open", "closed_won", "closed_lost"],
+                    },
                 },
                 "custom_code": '@property\ndef display_name(self) -> str:\n    """Return display name for the stage."""\n    if isinstance(self.pipeline, str):\n        return f\'{self.pipeline} - {self.name}\'\n    return f\'{self.pipeline.display_name} - {self.name}\'',
                 "storage_metadata": {
@@ -440,48 +505,52 @@ class Migration(migrations.Migration):
             class_name="Deal",
             new_schema={
                 "title": "Deal",
-                "required": ["name", "stage", "owner_email"],
+                "required": ["name", "entity", "stage"],
                 "properties": {
                     "created_at": {"type": "datetime", "title": "Created At", "format": "date-time"},
                     "updated_at": {"type": "datetime", "title": "Updated At", "format": "date-time"},
                     "name": {"type": "string", "title": "Deal Name"},
                     "amount": {"type": "number", "title": "Amount"},
                     "currency": {"type": "string", "default": "USD", "title": "Currency"},
-                    "account": {
-                        "type": "Account",
-                        "title": "Account",
-                        "description": "Account (Company/Organization) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
-                    },
-                    "contact": {
-                        "type": "Contact",
-                        "title": "Primary Contact",
-                        "description": "Contact (Person) model.\n\nRepresents a person in the CRM system, optionally linked to an Account.\nOwned by individual users with permission controls.",
+                    "entity": {
+                        "type": "Entity",
+                        "title": "Entity",
+                        "description": "Entity (Person/Organization/Trust) model.\n\nRepresents a company or organization in the CRM system.\nOwned by individual users with permission controls.",
                     },
                     "stage": {
                         "type": "Stage",
                         "title": "Stage",
                         "description": "Pipeline stage model.\n\nRepresents a stage within a sales pipeline with win probability\nand closed status indicators.",
                     },
-                    "owner_email": {"type": "string", "title": "Owner Email"},
                     "expected_close_date": {"type": "datetime", "title": "Expected Close Date", "format": "date-time"},
                     "closed_date": {"type": "datetime", "title": "Closed Date", "format": "date-time"},
-                    "is_closed": {"type": "boolean", "default": False, "title": "Is Closed"},
-                    "is_won": {"type": "boolean", "default": False, "title": "Is Won"},
+                    "status": {
+                        "type": "string",
+                        "default": "open",
+                        "options": [
+                            {"key": "open", "value": "open"},
+                            {"key": "closed_won", "value": "closed_won"},
+                            {"key": "closed_lost", "value": "closed_lost"},
+                        ],
+                        "title": "Status",
+                        "enum": ["open", "closed_won", "closed_lost"],
+                    },
                     "custom_fields": {"type": "anything", "title": "Custom Fields"},
+                    "assigned_to": {"type": "User", "title": "Assigned To"},
                 },
-                "custom_code": 'import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\nfrom amsdal_utils.models.data_models.reference import Reference\n\n\n@property\ndef display_name(self) -> str:\n    """Return display name for the deal."""\n    return self.name\n\n@property\ndef stage_name(self) -> str:\n    """Returns stage name for display."""\n    if hasattr(self.stage, \'name\'):\n        return self.stage.name\n    return str(self.stage)\n\nasync def apost_update(self) -> None:\n    """Async hook called after updating deal."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules(\'Deal\', \'update\', self)\n\nasync def apre_create(self) -> None:\n    """Async hook called before creating deal."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Deal\', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    """Async hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        """\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields(\'Deal\', self.custom_fields)\n    stage = await self.stage\n    self.is_closed = stage.is_closed_won or stage.is_closed_lost\n    self.is_won = stage.is_closed_won\n    if self.is_closed and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: \'User\', action: str) -> bool:\n    """Check if user has permission to perform action on this deal.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        """\n    if self.owner_email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == \'*\' and permission.action in (\'*\', action):\n                return True\n            if permission.model == \'Deal\' and permission.action in (\'*\', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    """Hook called after updating deal."""\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules(\'Deal\', \'update\', self)\n\ndef pre_create(self) -> None:\n    """Hook called before creating deal."""\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Deal\', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    """Hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        """\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields(\'Deal\', self.custom_fields)\n    from amsdal_models.classes.helpers.reference_loader import ReferenceLoader\n    stage = ReferenceLoader(self.stage).load_reference() if isinstance(self.stage, Reference) else self.stage\n    self.is_closed = stage.is_closed_won or stage.is_closed_lost\n    self.is_won = stage.is_closed_won\n    if self.is_closed and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    super().pre_update()',
+                "custom_code": "import datetime as _dt\n\nfrom amsdal.contrib.auth.models.user import User\nfrom amsdal_utils.models.data_models.reference import Reference\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"Return display name for the deal.\"\"\"\n    return self.name\n\n@property\ndef stage_name(self) -> str:\n    \"\"\"Returns stage name for display.\"\"\"\n    if hasattr(self.stage, 'name'):\n        return self.stage.name\n    return str(self.stage)\n\nasync def apost_update(self) -> None:\n    \"\"\"Async hook called after updating deal.\"\"\"\n    from amsdal_crm.services.workflow_service import WorkflowService\n    await WorkflowService.aexecute_rules('Deal', 'update', self)\n\nasync def apre_create(self) -> None:\n    \"\"\"Async hook called before creating deal.\"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)\n    await super().apre_create()\n\nasync def apre_update(self) -> None:\n    \"\"\"Async hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        \"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = await CustomFieldService.avalidate_custom_fields('Deal', self.custom_fields)\n    stage = await self.stage\n    if stage.status == 'open':\n        self.status = 'open'\n    if stage.status == 'closed_won':\n        self.status = 'closed_won'\n    if stage.status == 'closed_lost':\n        self.status = 'closed_lost'\n    if self.status in ('closed_won', 'closed_lost') and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    await super().apre_update()\n\ndef has_object_permission(self, user: 'User', action: str) -> bool:\n    \"\"\"Check if user has permission to perform action on this deal.\n\n        Args:\n            user: The user attempting the action\n            action: The action being attempted (read, create, update, delete)\n\n        Returns:\n            True if user has permission, False otherwise\n        \"\"\"\n    if self.assigned_to and self.assigned_to.email == user.email:\n        return True\n    if user.permissions:\n        for permission in user.permissions:\n            if permission.model == '*' and permission.action in ('*', action):\n                return True\n            if permission.model == 'Deal' and permission.action in ('*', action):\n                return True\n    return False\n\ndef post_update(self) -> None:\n    \"\"\"Hook called after updating deal.\"\"\"\n    from amsdal_crm.services.workflow_service import WorkflowService\n    WorkflowService.execute_rules('Deal', 'update', self)\n\ndef pre_create(self) -> None:\n    \"\"\"Hook called before creating deal.\"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)\n    super().pre_create()\n\ndef pre_update(self) -> None:\n    \"\"\"Hook called before updating deal.\n\n        Automatically syncs is_closed and is_won status with stage,\n        and sets closed_date when deal is closed.\n        \"\"\"\n    if self.custom_fields:\n        from amsdal_crm.services.custom_field_service import CustomFieldService\n        self.custom_fields = CustomFieldService.validate_custom_fields('Deal', self.custom_fields)\n    from amsdal_models.classes.helpers.reference_loader import ReferenceLoader\n    stage = ReferenceLoader(self.stage).load_reference() if isinstance(self.stage, Reference) else self.stage\n    if stage.status == 'open':\n        self.status = 'open'\n    if stage.status == 'closed_won':\n        self.status = 'closed_won'\n    if stage.status == 'closed_lost':\n        self.status = 'closed_lost'\n    if self.status in ('closed_won', 'closed_lost') and (not self.closed_date):\n        self.closed_date = _dt.datetime.now(_dt.UTC)\n    super().pre_update()",
                 "storage_metadata": {
                     "table_name": "Deal",
                     "db_fields": {
-                        "account": ["account_partition_key"],
-                        "contact": ["contact_partition_key"],
+                        "entity": ["entity_partition_key"],
                         "stage": ["stage_partition_key"],
+                        "assigned_to": ["assigned_to_partition_key"],
                     },
                     "primary_key": ["partition_key"],
-                    "indexed": [["owner_email"], ["expected_close_date"], ["created_at"]],
+                    "indexed": [["expected_close_date"], ["created_at"]],
                     "foreign_keys": {
-                        "account": [{"account_partition_key": "string"}, "Account", ["partition_key"]],
-                        "contact": [{"contact_partition_key": "string"}, "Contact", ["partition_key"]],
+                        "assigned_to": [{"assigned_to_partition_key": "string"}, "User", ["partition_key"]],
+                        "entity": [{"entity_partition_key": "string"}, "Entity", ["partition_key"]],
                         "stage": [{"stage_partition_key": "string"}, "Stage", ["partition_key"]],
                     },
                 },
@@ -498,13 +567,12 @@ class Migration(migrations.Migration):
                     "related_to_type": {
                         "type": "string",
                         "options": [
-                            {"key": "Contact", "value": "Contact"},
-                            {"key": "Account", "value": "Account"},
+                            {"key": "Entity", "value": "Entity"},
                             {"key": "Deal", "value": "Deal"},
                             {"key": "Activity", "value": "Activity"},
                         ],
                         "title": "Related To Type",
-                        "enum": ["Contact", "Account", "Deal", "Activity"],
+                        "enum": ["Entity", "Deal", "Activity"],
                     },
                     "related_to_id": {"type": "string", "title": "Related To ID"},
                     "uploaded_by": {"type": "string", "title": "Uploaded By (User Email)"},
@@ -533,12 +601,22 @@ class Migration(migrations.Migration):
                     "entity_type": {
                         "type": "string",
                         "options": [
-                            {"key": "Contact", "value": "Contact"},
-                            {"key": "Account", "value": "Account"},
+                            {"key": "Entity", "value": "Entity"},
+                            {"key": "EntityRelationship", "value": "EntityRelationship"},
                             {"key": "Deal", "value": "Deal"},
+                            {"key": "EntityIdentifier", "value": "EntityIdentifier"},
+                            {"key": "EntityContactPoint", "value": "EntityContactPoint"},
+                            {"key": "EntityAddress", "value": "EntityAddress"},
                         ],
                         "title": "Entity Type",
-                        "enum": ["Contact", "Account", "Deal"],
+                        "enum": [
+                            "Entity",
+                            "EntityRelationship",
+                            "Deal",
+                            "EntityIdentifier",
+                            "EntityContactPoint",
+                            "EntityAddress",
+                        ],
                     },
                     "field_name": {"type": "string", "title": "Field Name"},
                     "field_label": {"type": "string", "title": "Field Label"},
@@ -581,13 +659,12 @@ class Migration(migrations.Migration):
                     "entity_type": {
                         "type": "string",
                         "options": [
-                            {"key": "Contact", "value": "Contact"},
-                            {"key": "Account", "value": "Account"},
+                            {"key": "Entity", "value": "Entity"},
                             {"key": "Deal", "value": "Deal"},
                             {"key": "Activity", "value": "Activity"},
                         ],
                         "title": "Entity Type",
-                        "enum": ["Contact", "Account", "Deal", "Activity"],
+                        "enum": ["Entity", "Deal", "Activity"],
                     },
                     "trigger_event": {
                         "type": "string",