acryl-datahub 0.15.0.6rc3__py3-none-any.whl → 1.0.0__py3-none-any.whl

datahub/metadata/_urns/urn_defs.py

@@ -10,7 +10,7 @@
 
 # This file contains classes corresponding to entity URNs.
 
-from typing import ClassVar, List, Optional, Type, TYPE_CHECKING, Union
+from typing import ClassVar, List, Optional, Type, TYPE_CHECKING, Union, Literal
 
 import functools
 from deprecated.sphinx import deprecated as _sphinx_deprecated
@@ -22,122 +22,122 @@ from datahub.utilities.urns.error import InvalidUrnError
 deprecated = functools.partial(_sphinx_deprecated, version="0.12.0.2")
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import StructuredPropertyKeyClass
+    from datahub.metadata.schema_classes import BusinessAttributeKeyClass
 
-class StructuredPropertyUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "structuredProperty"
+class BusinessAttributeUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["businessAttribute"]] = "businessAttribute"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["StructuredPropertyUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["BusinessAttributeUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = StructuredPropertyUrn.from_string(id)
+                        id = BusinessAttributeUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a StructuredPropertyUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a BusinessAttributeUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("StructuredPropertyUrn id cannot be empty")
-        if isinstance(id, StructuredPropertyUrn):
+            raise InvalidUrnError("BusinessAttributeUrn id cannot be empty")
+        if isinstance(id, BusinessAttributeUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a StructuredPropertyUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a BusinessAttributeUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'StructuredPropertyUrn id contains reserved characters')
+            raise InvalidUrnError(f'BusinessAttributeUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "StructuredPropertyUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "BusinessAttributeUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"StructuredPropertyUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"BusinessAttributeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["StructuredPropertyKeyClass"]:
-        from datahub.metadata.schema_classes import StructuredPropertyKeyClass
+    def underlying_key_aspect_type(cls) -> Type["BusinessAttributeKeyClass"]:
+        from datahub.metadata.schema_classes import BusinessAttributeKeyClass
 
-        return StructuredPropertyKeyClass
+        return BusinessAttributeKeyClass
 
-    def to_key_aspect(self) -> "StructuredPropertyKeyClass":
-        from datahub.metadata.schema_classes import StructuredPropertyKeyClass
+    def to_key_aspect(self) -> "BusinessAttributeKeyClass":
+        from datahub.metadata.schema_classes import BusinessAttributeKeyClass
 
-        return StructuredPropertyKeyClass(id=self.id)
+        return BusinessAttributeKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "StructuredPropertyKeyClass") -> "StructuredPropertyUrn":
+    def from_key_aspect(cls, key_aspect: "BusinessAttributeKeyClass") -> "BusinessAttributeUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import BusinessAttributeKeyClass
+    from datahub.metadata.schema_classes import DataTypeKeyClass
 
-class BusinessAttributeUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "businessAttribute"
+class DataTypeUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataType"]] = "dataType"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["BusinessAttributeUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataTypeUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = BusinessAttributeUrn.from_string(id)
+                        id = DataTypeUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a BusinessAttributeUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a DataTypeUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("BusinessAttributeUrn id cannot be empty")
-        if isinstance(id, BusinessAttributeUrn):
+            raise InvalidUrnError("DataTypeUrn id cannot be empty")
+        if isinstance(id, DataTypeUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a BusinessAttributeUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a DataTypeUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'BusinessAttributeUrn id contains reserved characters')
+            raise InvalidUrnError(f'DataTypeUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "BusinessAttributeUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataTypeUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"BusinessAttributeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"DataTypeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["BusinessAttributeKeyClass"]:
-        from datahub.metadata.schema_classes import BusinessAttributeKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataTypeKeyClass"]:
+        from datahub.metadata.schema_classes import DataTypeKeyClass
 
-        return BusinessAttributeKeyClass
+        return DataTypeKeyClass
 
-    def to_key_aspect(self) -> "BusinessAttributeKeyClass":
-        from datahub.metadata.schema_classes import BusinessAttributeKeyClass
+    def to_key_aspect(self) -> "DataTypeKeyClass":
+        from datahub.metadata.schema_classes import DataTypeKeyClass
 
-        return BusinessAttributeKeyClass(id=self.id)
+        return DataTypeKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "BusinessAttributeKeyClass") -> "BusinessAttributeUrn":
+    def from_key_aspect(cls, key_aspect: "DataTypeKeyClass") -> "DataTypeUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
     from datahub.metadata.schema_classes import DataProductKeyClass
 
 class DataProductUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataProduct"
+    ENTITY_TYPE: ClassVar[Literal["dataProduct"]] = "dataProduct"
     _URN_PARTS: ClassVar[int] = 1
 
     def __init__(self, id: Union["DataProductUrn", str], *, _allow_coercion: bool = True) -> None:
@@ -187,305 +187,237 @@ class DataProductUrn(_SpecificUrn):
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataTypeKeyClass
+    from datahub.metadata.schema_classes import TelemetryKeyClass
 
-class DataTypeUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataType"
+class TelemetryUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["telemetry"]] = "telemetry"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataTypeUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, name: Union["TelemetryUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
+            if isinstance(name, str):
+                if name.startswith('urn:li:'):
                     try:
-                        id = DataTypeUrn.from_string(id)
+                        name = TelemetryUrn.from_string(name)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataTypeUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a TelemetryUrn but got {name}')
                 else:
-                    id = UrnEncoder.encode_string(id)
+                    name = UrnEncoder.encode_string(name)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataTypeUrn id cannot be empty")
-        if isinstance(id, DataTypeUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataTypeUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataTypeUrn id contains reserved characters')
+        if not name:
+            raise InvalidUrnError("TelemetryUrn name cannot be empty")
+        if isinstance(name, TelemetryUrn):
+            name = name.name
+        elif isinstance(name, Urn):
+            raise InvalidUrnError(f'Expecting a TelemetryUrn but got {name}')
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'TelemetryUrn name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataTypeUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "TelemetryUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataTypeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"TelemetryUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(name=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataTypeKeyClass"]:
-        from datahub.metadata.schema_classes import DataTypeKeyClass
+    def underlying_key_aspect_type(cls) -> Type["TelemetryKeyClass"]:
+        from datahub.metadata.schema_classes import TelemetryKeyClass
 
-        return DataTypeKeyClass
+        return TelemetryKeyClass
 
-    def to_key_aspect(self) -> "DataTypeKeyClass":
-        from datahub.metadata.schema_classes import DataTypeKeyClass
+    def to_key_aspect(self) -> "TelemetryKeyClass":
+        from datahub.metadata.schema_classes import TelemetryKeyClass
 
-        return DataTypeKeyClass(id=self.id)
+        return TelemetryKeyClass(name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataTypeKeyClass") -> "DataTypeUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "TelemetryKeyClass") -> "TelemetryUrn":
+        return cls(name=key_aspect.name)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def name(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import PlatformResourceKeyClass
+    from datahub.metadata.schema_classes import DataHubAccessTokenKeyClass
 
-class PlatformResourceUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "platformResource"
+class DataHubAccessTokenUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubAccessToken"]] = "dataHubAccessToken"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["PlatformResourceUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubAccessTokenUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = PlatformResourceUrn.from_string(id)
+                        id = DataHubAccessTokenUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a PlatformResourceUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a DataHubAccessTokenUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("PlatformResourceUrn id cannot be empty")
-        if isinstance(id, PlatformResourceUrn):
+            raise InvalidUrnError("DataHubAccessTokenUrn id cannot be empty")
+        if isinstance(id, DataHubAccessTokenUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a PlatformResourceUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a DataHubAccessTokenUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'PlatformResourceUrn id contains reserved characters')
+            raise InvalidUrnError(f'DataHubAccessTokenUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "PlatformResourceUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubAccessTokenUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"PlatformResourceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"DataHubAccessTokenUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["PlatformResourceKeyClass"]:
-        from datahub.metadata.schema_classes import PlatformResourceKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubAccessTokenKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubAccessTokenKeyClass
 
-        return PlatformResourceKeyClass
+        return DataHubAccessTokenKeyClass
 
-    def to_key_aspect(self) -> "PlatformResourceKeyClass":
-        from datahub.metadata.schema_classes import PlatformResourceKeyClass
+    def to_key_aspect(self) -> "DataHubAccessTokenKeyClass":
+        from datahub.metadata.schema_classes import DataHubAccessTokenKeyClass
 
-        return PlatformResourceKeyClass(id=self.id)
+        return DataHubAccessTokenKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "PlatformResourceKeyClass") -> "PlatformResourceUrn":
+    def from_key_aspect(cls, key_aspect: "DataHubAccessTokenKeyClass") -> "DataHubAccessTokenUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import MLModelGroupKeyClass
+    from datahub.metadata.schema_classes import DataHubConnectionKeyClass
 
-class MlModelGroupUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "mlModelGroup"
-    _URN_PARTS: ClassVar[int] = 3
+class DataHubConnectionUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubConnection"]] = "dataHubConnection"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, platform: Union["DataPlatformUrn", str], name: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubConnectionUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            platform = DataPlatformUrn(platform).urn()
-            name = UrnEncoder.encode_string(name)
-            env = env.upper()
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = DataHubConnectionUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a DataHubConnectionUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not platform:
-            raise InvalidUrnError("MlModelGroupUrn platform cannot be empty")
-        platform = str(platform)  # convert urn type to str
-        assert DataPlatformUrn.from_string(platform)
-        if not name:
-            raise InvalidUrnError("MlModelGroupUrn name cannot be empty")
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'MlModelGroupUrn name contains reserved characters')
-        if not env:
-            raise InvalidUrnError("MlModelGroupUrn env cannot be empty")
-        if UrnEncoder.contains_reserved_char(env):
-            raise InvalidUrnError(f'MlModelGroupUrn env contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DataHubConnectionUrn id cannot be empty")
+        if isinstance(id, DataHubConnectionUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataHubConnectionUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataHubConnectionUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [platform, name, env])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "MlModelGroupUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubConnectionUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"MlModelGroupUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(platform=entity_ids[0], name=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
+            raise InvalidUrnError(f"DataHubConnectionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["MLModelGroupKeyClass"]:
-        from datahub.metadata.schema_classes import MLModelGroupKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubConnectionKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubConnectionKeyClass
 
-        return MLModelGroupKeyClass
+        return DataHubConnectionKeyClass
 
-    def to_key_aspect(self) -> "MLModelGroupKeyClass":
-        from datahub.metadata.schema_classes import MLModelGroupKeyClass
+    def to_key_aspect(self) -> "DataHubConnectionKeyClass":
+        from datahub.metadata.schema_classes import DataHubConnectionKeyClass
 
-        return MLModelGroupKeyClass(platform=self.platform, name=self.name, origin=self.env)
+        return DataHubConnectionKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "MLModelGroupKeyClass") -> "MlModelGroupUrn":
-        return cls(platform=key_aspect.platform, name=key_aspect.name, env=key_aspect.origin)
-
-    @property
-    def platform(self) -> str:
-        return self.entity_ids[0]
-
-    @property
-    def name(self) -> str:
-        return self.entity_ids[1]
+    def from_key_aspect(cls, key_aspect: "DataHubConnectionKeyClass") -> "DataHubConnectionUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def env(self) -> str:
-        return self.entity_ids[2]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubPolicyKeyClass
+    from datahub.metadata.schema_classes import DataHubRoleKeyClass
 
-class DataHubPolicyUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubPolicy"
+class DataHubRoleUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubRole"]] = "dataHubRole"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataHubPolicyUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubRoleUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DataHubPolicyUrn.from_string(id)
+                        id = DataHubRoleUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubPolicyUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a DataHubRoleUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DataHubPolicyUrn id cannot be empty")
-        if isinstance(id, DataHubPolicyUrn):
+            raise InvalidUrnError("DataHubRoleUrn id cannot be empty")
+        if isinstance(id, DataHubRoleUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubPolicyUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a DataHubRoleUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubPolicyUrn id contains reserved characters')
+            raise InvalidUrnError(f'DataHubRoleUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubPolicyUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubRoleUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubPolicyUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"DataHubRoleUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubPolicyKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubPolicyKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubRoleKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubRoleKeyClass
 
-        return DataHubPolicyKeyClass
+        return DataHubRoleKeyClass
 
-    def to_key_aspect(self) -> "DataHubPolicyKeyClass":
-        from datahub.metadata.schema_classes import DataHubPolicyKeyClass
+    def to_key_aspect(self) -> "DataHubRoleKeyClass":
+        from datahub.metadata.schema_classes import DataHubRoleKeyClass
 
-        return DataHubPolicyKeyClass(id=self.id)
+        return DataHubRoleKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubPolicyKeyClass") -> "DataHubPolicyUrn":
+    def from_key_aspect(cls, key_aspect: "DataHubRoleKeyClass") -> "DataHubRoleUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
-
-if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import TagKeyClass
-
-class TagUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "tag"
-    _URN_PARTS: ClassVar[int] = 1
-
-    def __init__(self, name: Union["TagUrn", str], *, _allow_coercion: bool = True) -> None:
-        if _allow_coercion:
-            # Field coercion logic (if any is required).
-            if isinstance(name, str):
-                if name.startswith('urn:li:'):
-                    try:
-                        name = TagUrn.from_string(name)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a TagUrn but got {name}')
-                else:
-                    name = UrnEncoder.encode_string(name)
-
-        # Validation logic.
-        if not name:
-            raise InvalidUrnError("TagUrn name cannot be empty")
-        if isinstance(name, TagUrn):
-            name = name.name
-        elif isinstance(name, Urn):
-            raise InvalidUrnError(f'Expecting a TagUrn but got {name}')
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'TagUrn name contains reserved characters')
-
-        super().__init__(self.ENTITY_TYPE, [name])
-
-    @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "TagUrn":
-        if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"TagUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(name=entity_ids[0], _allow_coercion=False)
-
-    @classmethod
-    def underlying_key_aspect_type(cls) -> Type["TagKeyClass"]:
-        from datahub.metadata.schema_classes import TagKeyClass
-
-        return TagKeyClass
-
-    def to_key_aspect(self) -> "TagKeyClass":
-        from datahub.metadata.schema_classes import TagKeyClass
-
-        return TagKeyClass(name=self.name)
-
-    @classmethod
-    def from_key_aspect(cls, key_aspect: "TagKeyClass") -> "TagUrn":
-        return cls(name=key_aspect.name)
-
-    @classmethod
-    @deprecated(reason="Use the constructor instead")
-    def create_from_id(cls, id: str) -> "TagUrn":
-        return cls(id)
-
-    @property
-    def name(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import MLModelDeploymentKeyClass
+    from datahub.metadata.schema_classes import MLModelKeyClass
 
-class MlModelDeploymentUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "mlModelDeployment"
+class MlModelUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["mlModel"]] = "mlModel"
     _URN_PARTS: ClassVar[int] = 3
 
     def __init__(self, platform: Union["DataPlatformUrn", str], name: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
@@ -497,685 +429,621 @@ class MlModelDeploymentUrn(_SpecificUrn):
 
         # Validation logic.
         if not platform:
-            raise InvalidUrnError("MlModelDeploymentUrn platform cannot be empty")
+            raise InvalidUrnError("MlModelUrn platform cannot be empty")
         platform = str(platform)  # convert urn type to str
         assert DataPlatformUrn.from_string(platform)
         if not name:
-            raise InvalidUrnError("MlModelDeploymentUrn name cannot be empty")
+            raise InvalidUrnError("MlModelUrn name cannot be empty")
         if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'MlModelDeploymentUrn name contains reserved characters')
+            raise InvalidUrnError(f'MlModelUrn name contains reserved characters')
         if not env:
-            raise InvalidUrnError("MlModelDeploymentUrn env cannot be empty")
+            raise InvalidUrnError("MlModelUrn env cannot be empty")
         if UrnEncoder.contains_reserved_char(env):
-            raise InvalidUrnError(f'MlModelDeploymentUrn env contains reserved characters')
+            raise InvalidUrnError(f'MlModelUrn env contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [platform, name, env])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "MlModelDeploymentUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "MlModelUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"MlModelDeploymentUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"MlModelUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(platform=entity_ids[0], name=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["MLModelDeploymentKeyClass"]:
-        from datahub.metadata.schema_classes import MLModelDeploymentKeyClass
+    def underlying_key_aspect_type(cls) -> Type["MLModelKeyClass"]:
+        from datahub.metadata.schema_classes import MLModelKeyClass
 
-        return MLModelDeploymentKeyClass
+        return MLModelKeyClass
 
-    def to_key_aspect(self) -> "MLModelDeploymentKeyClass":
-        from datahub.metadata.schema_classes import MLModelDeploymentKeyClass
+    def to_key_aspect(self) -> "MLModelKeyClass":
+        from datahub.metadata.schema_classes import MLModelKeyClass
 
-        return MLModelDeploymentKeyClass(platform=self.platform, name=self.name, origin=self.env)
+        return MLModelKeyClass(platform=self.platform, name=self.name, origin=self.env)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "MLModelDeploymentKeyClass") -> "MlModelDeploymentUrn":
+    def from_key_aspect(cls, key_aspect: "MLModelKeyClass") -> "MlModelUrn":
         return cls(platform=key_aspect.platform, name=key_aspect.name, env=key_aspect.origin)
 
     @property
     def platform(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
     @property
     def name(self) -> str:
-        return self.entity_ids[1]
+        return self._entity_ids[1]
 
     @property
     def env(self) -> str:
-        return self.entity_ids[2]
+        return self._entity_ids[2]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubActionKeyClass
+    from datahub.metadata.schema_classes import NotebookKeyClass
 
-class DataHubActionUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubAction"
-    _URN_PARTS: ClassVar[int] = 1
+class NotebookUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["notebook"]] = "notebook"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, id: Union["DataHubActionUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, notebook_tool: str, notebook_id: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
-                    try:
-                        id = DataHubActionUrn.from_string(id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubActionUrn but got {id}')
-                else:
-                    id = UrnEncoder.encode_string(id)
+            notebook_tool = UrnEncoder.encode_string(notebook_tool)
+            notebook_id = UrnEncoder.encode_string(notebook_id)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataHubActionUrn id cannot be empty")
-        if isinstance(id, DataHubActionUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubActionUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubActionUrn id contains reserved characters')
+        if not notebook_tool:
+            raise InvalidUrnError("NotebookUrn notebook_tool cannot be empty")
+        if UrnEncoder.contains_reserved_char(notebook_tool):
+            raise InvalidUrnError(f'NotebookUrn notebook_tool contains reserved characters')
+        if not notebook_id:
+            raise InvalidUrnError("NotebookUrn notebook_id cannot be empty")
+        if UrnEncoder.contains_reserved_char(notebook_id):
+            raise InvalidUrnError(f'NotebookUrn notebook_id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [notebook_tool, notebook_id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubActionUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "NotebookUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubActionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"NotebookUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(notebook_tool=entity_ids[0], notebook_id=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubActionKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubActionKeyClass
+    def underlying_key_aspect_type(cls) -> Type["NotebookKeyClass"]:
+        from datahub.metadata.schema_classes import NotebookKeyClass
 
-        return DataHubActionKeyClass
+        return NotebookKeyClass
 
-    def to_key_aspect(self) -> "DataHubActionKeyClass":
-        from datahub.metadata.schema_classes import DataHubActionKeyClass
+    def to_key_aspect(self) -> "NotebookKeyClass":
+        from datahub.metadata.schema_classes import NotebookKeyClass
 
-        return DataHubActionKeyClass(id=self.id)
+        return NotebookKeyClass(notebookTool=self.notebook_tool, notebookId=self.notebook_id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubActionKeyClass") -> "DataHubActionUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "NotebookKeyClass") -> "NotebookUrn":
+        return cls(notebook_tool=key_aspect.notebookTool, notebook_id=key_aspect.notebookId)
+
+    @deprecated(reason="Use .notebook_tool instead")
+    def get_platform_id(self) -> str:
+        return self.notebook_tool
+
+    @deprecated(reason="Use .notebook_id instead")
+    def get_notebook_id(self) -> str:
+        return self.notebook_id
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def notebook_tool(self) -> str:
+        return self._entity_ids[0]
+
+    @property
+    def notebook_id(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubRoleKeyClass
+    from datahub.metadata.schema_classes import RoleKeyClass
 
-class DataHubRoleUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubRole"
+class RoleUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["role"]] = "role"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataHubRoleUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["RoleUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DataHubRoleUrn.from_string(id)
+                        id = RoleUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubRoleUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a RoleUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DataHubRoleUrn id cannot be empty")
-        if isinstance(id, DataHubRoleUrn):
+            raise InvalidUrnError("RoleUrn id cannot be empty")
+        if isinstance(id, RoleUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubRoleUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a RoleUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubRoleUrn id contains reserved characters')
+            raise InvalidUrnError(f'RoleUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubRoleUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "RoleUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubRoleUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"RoleUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubRoleKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubRoleKeyClass
+    def underlying_key_aspect_type(cls) -> Type["RoleKeyClass"]:
+        from datahub.metadata.schema_classes import RoleKeyClass
 
-        return DataHubRoleKeyClass
+        return RoleKeyClass
 
-    def to_key_aspect(self) -> "DataHubRoleKeyClass":
-        from datahub.metadata.schema_classes import DataHubRoleKeyClass
+    def to_key_aspect(self) -> "RoleKeyClass":
+        from datahub.metadata.schema_classes import RoleKeyClass
 
-        return DataHubRoleKeyClass(id=self.id)
+        return RoleKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubRoleKeyClass") -> "DataHubRoleUrn":
+    def from_key_aspect(cls, key_aspect: "RoleKeyClass") -> "RoleUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubUpgradeKeyClass
+    from datahub.metadata.schema_classes import GlobalSettingsKeyClass
 
-class DataHubUpgradeUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubUpgrade"
+class GlobalSettingsUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["globalSettings"]] = "globalSettings"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataHubUpgradeUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["GlobalSettingsUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DataHubUpgradeUrn.from_string(id)
+                        id = GlobalSettingsUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubUpgradeUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a GlobalSettingsUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DataHubUpgradeUrn id cannot be empty")
-        if isinstance(id, DataHubUpgradeUrn):
+            raise InvalidUrnError("GlobalSettingsUrn id cannot be empty")
+        if isinstance(id, GlobalSettingsUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubUpgradeUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a GlobalSettingsUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubUpgradeUrn id contains reserved characters')
+            raise InvalidUrnError(f'GlobalSettingsUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubUpgradeUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "GlobalSettingsUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubUpgradeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"GlobalSettingsUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubUpgradeKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubUpgradeKeyClass
+    def underlying_key_aspect_type(cls) -> Type["GlobalSettingsKeyClass"]:
+        from datahub.metadata.schema_classes import GlobalSettingsKeyClass
 
-        return DataHubUpgradeKeyClass
+        return GlobalSettingsKeyClass
 
-    def to_key_aspect(self) -> "DataHubUpgradeKeyClass":
-        from datahub.metadata.schema_classes import DataHubUpgradeKeyClass
+    def to_key_aspect(self) -> "GlobalSettingsKeyClass":
+        from datahub.metadata.schema_classes import GlobalSettingsKeyClass
 
-        return DataHubUpgradeKeyClass(id=self.id)
+        return GlobalSettingsKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubUpgradeKeyClass") -> "DataHubUpgradeUrn":
+    def from_key_aspect(cls, key_aspect: "GlobalSettingsKeyClass") -> "GlobalSettingsUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import FormKeyClass
-
-class FormUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "form"
-    _URN_PARTS: ClassVar[int] = 1
+    from datahub.metadata.schema_classes import DatasetKeyClass
 
-    def __init__(self, id: Union["FormUrn", str], *, _allow_coercion: bool = True) -> None:
+class DatasetUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataset"]] = "dataset"
+    _URN_PARTS: ClassVar[int] = 3
+
+    def __init__(self, platform: Union["DataPlatformUrn", str], name: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
-                    try:
-                        id = FormUrn.from_string(id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a FormUrn but got {id}')
-                else:
-                    id = UrnEncoder.encode_string(id)
+            platform = DataPlatformUrn(platform).urn()
+            name = UrnEncoder.encode_string(name)
+            env = env.upper()
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("FormUrn id cannot be empty")
-        if isinstance(id, FormUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a FormUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'FormUrn id contains reserved characters')
+        if not platform:
+            raise InvalidUrnError("DatasetUrn platform cannot be empty")
+        platform = str(platform)  # convert urn type to str
+        assert DataPlatformUrn.from_string(platform)
+        if not name:
+            raise InvalidUrnError("DatasetUrn name cannot be empty")
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'DatasetUrn name contains reserved characters')
+        if not env:
+            raise InvalidUrnError("DatasetUrn env cannot be empty")
+        if UrnEncoder.contains_reserved_char(env):
+            raise InvalidUrnError(f'DatasetUrn env contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [platform, name, env])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "FormUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DatasetUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"FormUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
-
-    @classmethod
-    def underlying_key_aspect_type(cls) -> Type["FormKeyClass"]:
-        from datahub.metadata.schema_classes import FormKeyClass
-
-        return FormKeyClass
-
-    def to_key_aspect(self) -> "FormKeyClass":
-        from datahub.metadata.schema_classes import FormKeyClass
-
-        return FormKeyClass(id=self.id)
+            raise InvalidUrnError(f"DatasetUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(platform=entity_ids[0], name=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "FormKeyClass") -> "FormUrn":
-        return cls(id=key_aspect.id)
-
-    @property
-    def id(self) -> str:
-        return self.entity_ids[0]
-
-if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import NotebookKeyClass
-
-class NotebookUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "notebook"
-    _URN_PARTS: ClassVar[int] = 2
+    def underlying_key_aspect_type(cls) -> Type["DatasetKeyClass"]:
+        from datahub.metadata.schema_classes import DatasetKeyClass
 
-    def __init__(self, notebook_tool: str, notebook_id: str, *, _allow_coercion: bool = True) -> None:
-        if _allow_coercion:
-            # Field coercion logic (if any is required).
-            notebook_tool = UrnEncoder.encode_string(notebook_tool)
-            notebook_id = UrnEncoder.encode_string(notebook_id)
+        return DatasetKeyClass
 
-        # Validation logic.
-        if not notebook_tool:
-            raise InvalidUrnError("NotebookUrn notebook_tool cannot be empty")
-        if UrnEncoder.contains_reserved_char(notebook_tool):
-            raise InvalidUrnError(f'NotebookUrn notebook_tool contains reserved characters')
-        if not notebook_id:
-            raise InvalidUrnError("NotebookUrn notebook_id cannot be empty")
-        if UrnEncoder.contains_reserved_char(notebook_id):
-            raise InvalidUrnError(f'NotebookUrn notebook_id contains reserved characters')
+    def to_key_aspect(self) -> "DatasetKeyClass":
+        from datahub.metadata.schema_classes import DatasetKeyClass
 
-        super().__init__(self.ENTITY_TYPE, [notebook_tool, notebook_id])
+        return DatasetKeyClass(platform=self.platform, name=self.name, origin=self.env)
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "NotebookUrn":
-        if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"NotebookUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(notebook_tool=entity_ids[0], notebook_id=entity_ids[1], _allow_coercion=False)
+    def from_key_aspect(cls, key_aspect: "DatasetKeyClass") -> "DatasetUrn":
+        return cls(platform=key_aspect.platform, name=key_aspect.name, env=key_aspect.origin)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["NotebookKeyClass"]:
-        from datahub.metadata.schema_classes import NotebookKeyClass
+    def create_from_ids(
+        cls,
+        platform_id: str,
+        table_name: str,
+        env: str,
+        platform_instance: Optional[str] = None,
+    ) -> "DatasetUrn":
+        return DatasetUrn(
+            platform=platform_id,
+            name=f"{platform_instance}.{table_name}" if platform_instance else table_name,
+            env=env,
+        )
 
-        return NotebookKeyClass
+    from datahub.utilities.urns.field_paths import get_simple_field_path_from_v2_field_path as _get_simple_field_path_from_v2_field_path
 
-    def to_key_aspect(self) -> "NotebookKeyClass":
-        from datahub.metadata.schema_classes import NotebookKeyClass
+    get_simple_field_path_from_v2_field_path = staticmethod(deprecated(reason='Use the function from the field_paths module instead')(_get_simple_field_path_from_v2_field_path))
 
-        return NotebookKeyClass(notebookTool=self.notebook_tool, notebookId=self.notebook_id)
+    def get_data_platform_urn(self) -> "DataPlatformUrn":
+        return DataPlatformUrn.from_string(self.platform)
 
-    @classmethod
-    def from_key_aspect(cls, key_aspect: "NotebookKeyClass") -> "NotebookUrn":
-        return cls(notebook_tool=key_aspect.notebookTool, notebook_id=key_aspect.notebookId)
+    @deprecated(reason="Use .name instead")
+    def get_dataset_name(self) -> str:
+        return self.name
 
-    @deprecated(reason="Use .notebook_tool instead")
-    def get_platform_id(self) -> str:
-        return self.notebook_tool
+    @deprecated(reason="Use .env instead")
+    def get_env(self) -> str:
+        return self.env
 
-    @deprecated(reason="Use .notebook_id instead")
-    def get_notebook_id(self) -> str:
-        return self.notebook_id
+    @property
+    def platform(self) -> str:
+        return self._entity_ids[0]
 
     @property
-    def notebook_tool(self) -> str:
-        return self.entity_ids[0]
+    def name(self) -> str:
+        return self._entity_ids[1]
 
     @property
-    def notebook_id(self) -> str:
-        return self.entity_ids[1]
+    def env(self) -> str:
+        return self._entity_ids[2]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubConnectionKeyClass
+    from datahub.metadata.schema_classes import ChartKeyClass
 
-class DataHubConnectionUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubConnection"
-    _URN_PARTS: ClassVar[int] = 1
+class ChartUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["chart"]] = "chart"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, id: Union["DataHubConnectionUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, dashboard_tool: str, chart_id: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
-                    try:
-                        id = DataHubConnectionUrn.from_string(id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubConnectionUrn but got {id}')
-                else:
-                    id = UrnEncoder.encode_string(id)
+            dashboard_tool = UrnEncoder.encode_string(dashboard_tool)
+            chart_id = UrnEncoder.encode_string(chart_id)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataHubConnectionUrn id cannot be empty")
-        if isinstance(id, DataHubConnectionUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubConnectionUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubConnectionUrn id contains reserved characters')
+        if not dashboard_tool:
+            raise InvalidUrnError("ChartUrn dashboard_tool cannot be empty")
+        if UrnEncoder.contains_reserved_char(dashboard_tool):
+            raise InvalidUrnError(f'ChartUrn dashboard_tool contains reserved characters')
+        if not chart_id:
+            raise InvalidUrnError("ChartUrn chart_id cannot be empty")
+        if UrnEncoder.contains_reserved_char(chart_id):
+            raise InvalidUrnError(f'ChartUrn chart_id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [dashboard_tool, chart_id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubConnectionUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "ChartUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubConnectionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"ChartUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(dashboard_tool=entity_ids[0], chart_id=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubConnectionKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubConnectionKeyClass
+    def underlying_key_aspect_type(cls) -> Type["ChartKeyClass"]:
+        from datahub.metadata.schema_classes import ChartKeyClass
 
-        return DataHubConnectionKeyClass
+        return ChartKeyClass
 
-    def to_key_aspect(self) -> "DataHubConnectionKeyClass":
-        from datahub.metadata.schema_classes import DataHubConnectionKeyClass
+    def to_key_aspect(self) -> "ChartKeyClass":
+        from datahub.metadata.schema_classes import ChartKeyClass
 
-        return DataHubConnectionKeyClass(id=self.id)
+        return ChartKeyClass(dashboardTool=self.dashboard_tool, chartId=self.chart_id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubConnectionKeyClass") -> "DataHubConnectionUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "ChartKeyClass") -> "ChartUrn":
+        return cls(dashboard_tool=key_aspect.dashboardTool, chart_id=key_aspect.chartId)
 
+    @classmethod
+    def create_from_ids(
+        cls,
+        platform: str,
+        name: str,
+        platform_instance: Optional[str] = None,
+    ) -> "ChartUrn":
+        return ChartUrn(
+            dashboard_tool=platform,
+            chart_id=f"{platform_instance}.{name}" if platform_instance else name,
+        )
+        
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def dashboard_tool(self) -> str:
+        return self._entity_ids[0]
+
+    @property
+    def chart_id(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import IncidentKeyClass
+    from datahub.metadata.schema_classes import GlossaryNodeKeyClass
 
-class IncidentUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "incident"
+class GlossaryNodeUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["glossaryNode"]] = "glossaryNode"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["IncidentUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, name: Union["GlossaryNodeUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
+            if isinstance(name, str):
+                if name.startswith('urn:li:'):
                     try:
-                        id = IncidentUrn.from_string(id)
+                        name = GlossaryNodeUrn.from_string(name)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a IncidentUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a GlossaryNodeUrn but got {name}')
                 else:
-                    id = UrnEncoder.encode_string(id)
+                    name = UrnEncoder.encode_string(name)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("IncidentUrn id cannot be empty")
-        if isinstance(id, IncidentUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a IncidentUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'IncidentUrn id contains reserved characters')
+        if not name:
+            raise InvalidUrnError("GlossaryNodeUrn name cannot be empty")
+        if isinstance(name, GlossaryNodeUrn):
+            name = name.name
+        elif isinstance(name, Urn):
+            raise InvalidUrnError(f'Expecting a GlossaryNodeUrn but got {name}')
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'GlossaryNodeUrn name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "IncidentUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "GlossaryNodeUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"IncidentUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"GlossaryNodeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(name=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["IncidentKeyClass"]:
-        from datahub.metadata.schema_classes import IncidentKeyClass
+    def underlying_key_aspect_type(cls) -> Type["GlossaryNodeKeyClass"]:
+        from datahub.metadata.schema_classes import GlossaryNodeKeyClass
 
-        return IncidentKeyClass
+        return GlossaryNodeKeyClass
 
-    def to_key_aspect(self) -> "IncidentKeyClass":
-        from datahub.metadata.schema_classes import IncidentKeyClass
+    def to_key_aspect(self) -> "GlossaryNodeKeyClass":
+        from datahub.metadata.schema_classes import GlossaryNodeKeyClass
 
-        return IncidentKeyClass(id=self.id)
+        return GlossaryNodeKeyClass(name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "IncidentKeyClass") -> "IncidentUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "GlossaryNodeKeyClass") -> "GlossaryNodeUrn":
+        return cls(name=key_aspect.name)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def name(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import RoleKeyClass
+    from datahub.metadata.schema_classes import AssertionKeyClass
 
-class RoleUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "role"
+class AssertionUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["assertion"]] = "assertion"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["RoleUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, assertion_id: Union["AssertionUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
+            if isinstance(assertion_id, str):
+                if assertion_id.startswith('urn:li:'):
                     try:
-                        id = RoleUrn.from_string(id)
+                        assertion_id = AssertionUrn.from_string(assertion_id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a RoleUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a AssertionUrn but got {assertion_id}')
                 else:
-                    id = UrnEncoder.encode_string(id)
+                    assertion_id = UrnEncoder.encode_string(assertion_id)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("RoleUrn id cannot be empty")
-        if isinstance(id, RoleUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a RoleUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'RoleUrn id contains reserved characters')
+        if not assertion_id:
+            raise InvalidUrnError("AssertionUrn assertion_id cannot be empty")
+        if isinstance(assertion_id, AssertionUrn):
+            assertion_id = assertion_id.assertion_id
+        elif isinstance(assertion_id, Urn):
+            raise InvalidUrnError(f'Expecting a AssertionUrn but got {assertion_id}')
+        if UrnEncoder.contains_reserved_char(assertion_id):
+            raise InvalidUrnError(f'AssertionUrn assertion_id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [assertion_id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "RoleUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "AssertionUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"RoleUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"AssertionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(assertion_id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["RoleKeyClass"]:
-        from datahub.metadata.schema_classes import RoleKeyClass
+    def underlying_key_aspect_type(cls) -> Type["AssertionKeyClass"]:
+        from datahub.metadata.schema_classes import AssertionKeyClass
 
-        return RoleKeyClass
+        return AssertionKeyClass
 
-    def to_key_aspect(self) -> "RoleKeyClass":
-        from datahub.metadata.schema_classes import RoleKeyClass
+    def to_key_aspect(self) -> "AssertionKeyClass":
+        from datahub.metadata.schema_classes import AssertionKeyClass
 
-        return RoleKeyClass(id=self.id)
+        return AssertionKeyClass(assertionId=self.assertion_id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "RoleKeyClass") -> "RoleUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "AssertionKeyClass") -> "AssertionUrn":
+        return cls(assertion_id=key_aspect.assertionId)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def assertion_id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DomainKeyClass
+    from datahub.metadata.schema_classes import ExecutionRequestKeyClass
 
-class DomainUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "domain"
+class DataHubExecutionRequestUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubExecutionRequest"]] = "dataHubExecutionRequest"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DomainUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubExecutionRequestUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DomainUrn.from_string(id)
+                        id = DataHubExecutionRequestUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DomainUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a DataHubExecutionRequestUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DomainUrn id cannot be empty")
-        if isinstance(id, DomainUrn):
+            raise InvalidUrnError("DataHubExecutionRequestUrn id cannot be empty")
+        if isinstance(id, DataHubExecutionRequestUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DomainUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a DataHubExecutionRequestUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DomainUrn id contains reserved characters')
+            raise InvalidUrnError(f'DataHubExecutionRequestUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DomainUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubExecutionRequestUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DomainUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"DataHubExecutionRequestUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DomainKeyClass"]:
-        from datahub.metadata.schema_classes import DomainKeyClass
+    def underlying_key_aspect_type(cls) -> Type["ExecutionRequestKeyClass"]:
+        from datahub.metadata.schema_classes import ExecutionRequestKeyClass
 
-        return DomainKeyClass
+        return ExecutionRequestKeyClass
 
-    def to_key_aspect(self) -> "DomainKeyClass":
-        from datahub.metadata.schema_classes import DomainKeyClass
+    def to_key_aspect(self) -> "ExecutionRequestKeyClass":
+        from datahub.metadata.schema_classes import ExecutionRequestKeyClass
 
-        return DomainKeyClass(id=self.id)
+        return ExecutionRequestKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DomainKeyClass") -> "DomainUrn":
+    def from_key_aspect(cls, key_aspect: "ExecutionRequestKeyClass") -> "DataHubExecutionRequestUrn":
         return cls(id=key_aspect.id)
 
-    @classmethod
-    @deprecated(reason="Use the constructor instead")
-    def create_from_id(cls, id: str) -> "DomainUrn":
-        return cls(id)
-
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataContractKeyClass
+    from datahub.metadata.schema_classes import MLModelGroupKeyClass
 
-class DataContractUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataContract"
-    _URN_PARTS: ClassVar[int] = 1
+class MlModelGroupUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["mlModelGroup"]] = "mlModelGroup"
+    _URN_PARTS: ClassVar[int] = 3
 
-    def __init__(self, id: Union["DataContractUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, platform: Union["DataPlatformUrn", str], name: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
-                    try:
-                        id = DataContractUrn.from_string(id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataContractUrn but got {id}')
-                else:
-                    id = UrnEncoder.encode_string(id)
+            platform = DataPlatformUrn(platform).urn()
+            name = UrnEncoder.encode_string(name)
+            env = env.upper()
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataContractUrn id cannot be empty")
-        if isinstance(id, DataContractUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataContractUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataContractUrn id contains reserved characters')
+        if not platform:
+            raise InvalidUrnError("MlModelGroupUrn platform cannot be empty")
+        platform = str(platform)  # convert urn type to str
+        assert DataPlatformUrn.from_string(platform)
+        if not name:
+            raise InvalidUrnError("MlModelGroupUrn name cannot be empty")
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'MlModelGroupUrn name contains reserved characters')
+        if not env:
+            raise InvalidUrnError("MlModelGroupUrn env cannot be empty")
+        if UrnEncoder.contains_reserved_char(env):
+            raise InvalidUrnError(f'MlModelGroupUrn env contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [platform, name, env])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataContractUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "MlModelGroupUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataContractUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
-
-    @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataContractKeyClass"]:
-        from datahub.metadata.schema_classes import DataContractKeyClass
-
-        return DataContractKeyClass
-
-    def to_key_aspect(self) -> "DataContractKeyClass":
-        from datahub.metadata.schema_classes import DataContractKeyClass
-
-        return DataContractKeyClass(id=self.id)
+            raise InvalidUrnError(f"MlModelGroupUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(platform=entity_ids[0], name=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataContractKeyClass") -> "DataContractUrn":
-        return cls(id=key_aspect.id)
-
-    @property
-    def id(self) -> str:
-        return self.entity_ids[0]
-
-if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import AssertionKeyClass
-
-class AssertionUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "assertion"
-    _URN_PARTS: ClassVar[int] = 1
-
-    def __init__(self, assertion_id: Union["AssertionUrn", str], *, _allow_coercion: bool = True) -> None:
-        if _allow_coercion:
-            # Field coercion logic (if any is required).
-            if isinstance(assertion_id, str):
-                if assertion_id.startswith('urn:li:'):
-                    try:
-                        assertion_id = AssertionUrn.from_string(assertion_id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a AssertionUrn but got {assertion_id}')
-                else:
-                    assertion_id = UrnEncoder.encode_string(assertion_id)
+    def underlying_key_aspect_type(cls) -> Type["MLModelGroupKeyClass"]:
+        from datahub.metadata.schema_classes import MLModelGroupKeyClass
 
-        # Validation logic.
-        if not assertion_id:
-            raise InvalidUrnError("AssertionUrn assertion_id cannot be empty")
-        if isinstance(assertion_id, AssertionUrn):
-            assertion_id = assertion_id.assertion_id
-        elif isinstance(assertion_id, Urn):
-            raise InvalidUrnError(f'Expecting a AssertionUrn but got {assertion_id}')
-        if UrnEncoder.contains_reserved_char(assertion_id):
-            raise InvalidUrnError(f'AssertionUrn assertion_id contains reserved characters')
+        return MLModelGroupKeyClass
 
-        super().__init__(self.ENTITY_TYPE, [assertion_id])
+    def to_key_aspect(self) -> "MLModelGroupKeyClass":
+        from datahub.metadata.schema_classes import MLModelGroupKeyClass
 
-    @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "AssertionUrn":
-        if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"AssertionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(assertion_id=entity_ids[0], _allow_coercion=False)
+        return MLModelGroupKeyClass(platform=self.platform, name=self.name, origin=self.env)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["AssertionKeyClass"]:
-        from datahub.metadata.schema_classes import AssertionKeyClass
-
-        return AssertionKeyClass
-
-    def to_key_aspect(self) -> "AssertionKeyClass":
-        from datahub.metadata.schema_classes import AssertionKeyClass
+    def from_key_aspect(cls, key_aspect: "MLModelGroupKeyClass") -> "MlModelGroupUrn":
+        return cls(platform=key_aspect.platform, name=key_aspect.name, env=key_aspect.origin)
 
-        return AssertionKeyClass(assertionId=self.assertion_id)
+    @property
+    def platform(self) -> str:
+        return self._entity_ids[0]
 
-    @classmethod
-    def from_key_aspect(cls, key_aspect: "AssertionKeyClass") -> "AssertionUrn":
-        return cls(assertion_id=key_aspect.assertionId)
+    @property
+    def name(self) -> str:
+        return self._entity_ids[1]
 
     @property
-    def assertion_id(self) -> str:
-        return self.entity_ids[0]
+    def env(self) -> str:
+        return self._entity_ids[2]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DatasetKeyClass
+    from datahub.metadata.schema_classes import MLModelDeploymentKeyClass
 
-class DatasetUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataset"
+class MlModelDeploymentUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["mlModelDeployment"]] = "mlModelDeployment"
     _URN_PARTS: ClassVar[int] = 3
 
     def __init__(self, platform: Union["DataPlatformUrn", str], name: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
@@ -1187,87 +1055,147 @@ class DatasetUrn(_SpecificUrn):
 
         # Validation logic.
         if not platform:
-            raise InvalidUrnError("DatasetUrn platform cannot be empty")
+            raise InvalidUrnError("MlModelDeploymentUrn platform cannot be empty")
         platform = str(platform)  # convert urn type to str
         assert DataPlatformUrn.from_string(platform)
         if not name:
-            raise InvalidUrnError("DatasetUrn name cannot be empty")
+            raise InvalidUrnError("MlModelDeploymentUrn name cannot be empty")
         if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'DatasetUrn name contains reserved characters')
+            raise InvalidUrnError(f'MlModelDeploymentUrn name contains reserved characters')
         if not env:
-            raise InvalidUrnError("DatasetUrn env cannot be empty")
+            raise InvalidUrnError("MlModelDeploymentUrn env cannot be empty")
         if UrnEncoder.contains_reserved_char(env):
-            raise InvalidUrnError(f'DatasetUrn env contains reserved characters')
+            raise InvalidUrnError(f'MlModelDeploymentUrn env contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [platform, name, env])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DatasetUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "MlModelDeploymentUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DatasetUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"MlModelDeploymentUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(platform=entity_ids[0], name=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DatasetKeyClass"]:
-        from datahub.metadata.schema_classes import DatasetKeyClass
+    def underlying_key_aspect_type(cls) -> Type["MLModelDeploymentKeyClass"]:
+        from datahub.metadata.schema_classes import MLModelDeploymentKeyClass
 
-        return DatasetKeyClass
+        return MLModelDeploymentKeyClass
 
-    def to_key_aspect(self) -> "DatasetKeyClass":
-        from datahub.metadata.schema_classes import DatasetKeyClass
+    def to_key_aspect(self) -> "MLModelDeploymentKeyClass":
+        from datahub.metadata.schema_classes import MLModelDeploymentKeyClass
 
-        return DatasetKeyClass(platform=self.platform, name=self.name, origin=self.env)
+        return MLModelDeploymentKeyClass(platform=self.platform, name=self.name, origin=self.env)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DatasetKeyClass") -> "DatasetUrn":
+    def from_key_aspect(cls, key_aspect: "MLModelDeploymentKeyClass") -> "MlModelDeploymentUrn":
         return cls(platform=key_aspect.platform, name=key_aspect.name, env=key_aspect.origin)
 
+    @property
+    def platform(self) -> str:
+        return self._entity_ids[0]
+
+    @property
+    def name(self) -> str:
+        return self._entity_ids[1]
+
+    @property
+    def env(self) -> str:
+        return self._entity_ids[2]
+
+if TYPE_CHECKING:
+    from datahub.metadata.schema_classes import DataFlowKeyClass
+
+class DataFlowUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataFlow"]] = "dataFlow"
+    _URN_PARTS: ClassVar[int] = 3
+
+    def __init__(self, orchestrator: str, flow_id: str, cluster: str, *, _allow_coercion: bool = True) -> None:
+        if _allow_coercion:
+            # Field coercion logic (if any is required).
+            orchestrator = UrnEncoder.encode_string(orchestrator)
+            flow_id = UrnEncoder.encode_string(flow_id)
+            cluster = UrnEncoder.encode_string(cluster)
+
+        # Validation logic.
+        if not orchestrator:
+            raise InvalidUrnError("DataFlowUrn orchestrator cannot be empty")
+        if UrnEncoder.contains_reserved_char(orchestrator):
+            raise InvalidUrnError(f'DataFlowUrn orchestrator contains reserved characters')
+        if not flow_id:
+            raise InvalidUrnError("DataFlowUrn flow_id cannot be empty")
+        if UrnEncoder.contains_reserved_char(flow_id):
+            raise InvalidUrnError(f'DataFlowUrn flow_id contains reserved characters')
+        if not cluster:
+            raise InvalidUrnError("DataFlowUrn cluster cannot be empty")
+        if UrnEncoder.contains_reserved_char(cluster):
+            raise InvalidUrnError(f'DataFlowUrn cluster contains reserved characters')
+
+        super().__init__(self.ENTITY_TYPE, [orchestrator, flow_id, cluster])
+
+    @classmethod
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataFlowUrn":
+        if len(entity_ids) != cls._URN_PARTS:
+            raise InvalidUrnError(f"DataFlowUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(orchestrator=entity_ids[0], flow_id=entity_ids[1], cluster=entity_ids[2], _allow_coercion=False)
+
+    @classmethod
+    def underlying_key_aspect_type(cls) -> Type["DataFlowKeyClass"]:
+        from datahub.metadata.schema_classes import DataFlowKeyClass
+
+        return DataFlowKeyClass
+
+    def to_key_aspect(self) -> "DataFlowKeyClass":
+        from datahub.metadata.schema_classes import DataFlowKeyClass
+
+        return DataFlowKeyClass(orchestrator=self.orchestrator, flowId=self.flow_id, cluster=self.cluster)
+
+    @classmethod
+    def from_key_aspect(cls, key_aspect: "DataFlowKeyClass") -> "DataFlowUrn":
+        return cls(orchestrator=key_aspect.orchestrator, flow_id=key_aspect.flowId, cluster=key_aspect.cluster)
+
     @classmethod
     def create_from_ids(
         cls,
-        platform_id: str,
-        table_name: str,
+        orchestrator: str,
+        flow_id: str,
         env: str,
         platform_instance: Optional[str] = None,
-    ) -> "DatasetUrn":
-        return DatasetUrn(
-            platform=platform_id,
-            name=f"{platform_instance}.{table_name}" if platform_instance else table_name,
-            env=env,
+    ) -> "DataFlowUrn":
+        return cls(
+            orchestrator=orchestrator,
+            flow_id=f"{platform_instance}.{flow_id}" if platform_instance else flow_id,
+            cluster=env,
         )
 
-    from datahub.utilities.urns.field_paths import get_simple_field_path_from_v2_field_path as _get_simple_field_path_from_v2_field_path
-
-    get_simple_field_path_from_v2_field_path = staticmethod(deprecated(reason='Use the function from the field_paths module instead')(_get_simple_field_path_from_v2_field_path))
-
-    def get_data_platform_urn(self) -> "DataPlatformUrn":
-        return DataPlatformUrn.from_string(self.platform)
+    @deprecated(reason="Use .orchestrator instead")
+    def get_orchestrator_name(self) -> str:
+        return self.orchestrator
 
-    @deprecated(reason="Use .name instead")
-    def get_dataset_name(self) -> str:
-        return self.name
+    @deprecated(reason="Use .flow_id instead")
+    def get_flow_id(self) -> str:
+        return self.flow_id
 
-    @deprecated(reason="Use .env instead")
+    @deprecated(reason="Use .cluster instead")
     def get_env(self) -> str:
-        return self.env
+        return self.cluster
 
     @property
-    def platform(self) -> str:
-        return self.entity_ids[0]
+    def orchestrator(self) -> str:
+        return self._entity_ids[0]
 
     @property
-    def name(self) -> str:
-        return self.entity_ids[1]
+    def flow_id(self) -> str:
+        return self._entity_ids[1]
 
     @property
-    def env(self) -> str:
-        return self.entity_ids[2]
+    def cluster(self) -> str:
+        return self._entity_ids[2]
 
 if TYPE_CHECKING:
     from datahub.metadata.schema_classes import DataJobKeyClass
 
 class DataJobUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataJob"
+    ENTITY_TYPE: ClassVar[Literal["dataJob"]] = "dataJob"
     _URN_PARTS: ClassVar[int] = 2
 
     def __init__(self, flow: Union["DataFlowUrn", str], job_id: str, *, _allow_coercion: bool = True) -> None:
@@ -1329,354 +1257,493 @@ class DataJobUrn(_SpecificUrn):
 
     @property
     def flow(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
     @property
     def job_id(self) -> str:
-        return self.entity_ids[1]
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubSecretKeyClass
+    from datahub.metadata.schema_classes import CorpGroupKeyClass
 
-class DataHubSecretUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubSecret"
+class CorpGroupUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["corpGroup"]] = "corpGroup"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataHubSecretUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, name: Union["CorpGroupUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
+            if isinstance(name, str):
+                if name.startswith('urn:li:'):
                     try:
-                        id = DataHubSecretUrn.from_string(id)
+                        name = CorpGroupUrn.from_string(name)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubSecretUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a CorpGroupUrn but got {name}')
                 else:
-                    id = UrnEncoder.encode_string(id)
+                    name = UrnEncoder.encode_string(name)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataHubSecretUrn id cannot be empty")
-        if isinstance(id, DataHubSecretUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubSecretUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubSecretUrn id contains reserved characters')
+        if not name:
+            raise InvalidUrnError("CorpGroupUrn name cannot be empty")
+        if isinstance(name, CorpGroupUrn):
+            name = name.name
+        elif isinstance(name, Urn):
+            raise InvalidUrnError(f'Expecting a CorpGroupUrn but got {name}')
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'CorpGroupUrn name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubSecretUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "CorpGroupUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubSecretUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"CorpGroupUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(name=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubSecretKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubSecretKeyClass
+    def underlying_key_aspect_type(cls) -> Type["CorpGroupKeyClass"]:
+        from datahub.metadata.schema_classes import CorpGroupKeyClass
 
-        return DataHubSecretKeyClass
+        return CorpGroupKeyClass
 
-    def to_key_aspect(self) -> "DataHubSecretKeyClass":
-        from datahub.metadata.schema_classes import DataHubSecretKeyClass
+    def to_key_aspect(self) -> "CorpGroupKeyClass":
+        from datahub.metadata.schema_classes import CorpGroupKeyClass
 
-        return DataHubSecretKeyClass(id=self.id)
+        return CorpGroupKeyClass(name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubSecretKeyClass") -> "DataHubSecretUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "CorpGroupKeyClass") -> "CorpGroupUrn":
+        return cls(name=key_aspect.name)
+
+    @classmethod
+    @deprecated(reason="Use the constructor instead")
+    def create_from_id(cls, id: str) -> "CorpGroupUrn":
+        return cls(id)
+
+    @property
+    def name(self) -> str:
+        return self._entity_ids[0]
+
+if TYPE_CHECKING:
+    from datahub.metadata.schema_classes import DataPlatformKeyClass
+
+class DataPlatformUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataPlatform"]] = "dataPlatform"
+    _URN_PARTS: ClassVar[int] = 1
+
+    def __init__(self, platform_name: Union["DataPlatformUrn", str], *, _allow_coercion: bool = True) -> None:
+        if _allow_coercion:
+            # Field coercion logic (if any is required).
+            if isinstance(platform_name, str):
+                if platform_name.startswith('urn:li:'):
+                    try:
+                        platform_name = DataPlatformUrn.from_string(platform_name)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a DataPlatformUrn but got {platform_name}')
+                else:
+                    platform_name = UrnEncoder.encode_string(platform_name)
+
+        # Validation logic.
+        if not platform_name:
+            raise InvalidUrnError("DataPlatformUrn platform_name cannot be empty")
+        if isinstance(platform_name, DataPlatformUrn):
+            platform_name = platform_name.platform_name
+        elif isinstance(platform_name, Urn):
+            raise InvalidUrnError(f'Expecting a DataPlatformUrn but got {platform_name}')
+        if UrnEncoder.contains_reserved_char(platform_name):
+            raise InvalidUrnError(f'DataPlatformUrn platform_name contains reserved characters')
+
+        super().__init__(self.ENTITY_TYPE, [platform_name])
+
+    @classmethod
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataPlatformUrn":
+        if len(entity_ids) != cls._URN_PARTS:
+            raise InvalidUrnError(f"DataPlatformUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(platform_name=entity_ids[0], _allow_coercion=False)
+
+    @classmethod
+    def underlying_key_aspect_type(cls) -> Type["DataPlatformKeyClass"]:
+        from datahub.metadata.schema_classes import DataPlatformKeyClass
+
+        return DataPlatformKeyClass
+
+    def to_key_aspect(self) -> "DataPlatformKeyClass":
+        from datahub.metadata.schema_classes import DataPlatformKeyClass
+
+        return DataPlatformKeyClass(platformName=self.platform_name)
+
+    @classmethod
+    def from_key_aspect(cls, key_aspect: "DataPlatformKeyClass") -> "DataPlatformUrn":
+        return cls(platform_name=key_aspect.platformName)
+
+    @classmethod
+    @deprecated(reason="Use the constructor instead")
+    def create_from_id(cls, id: str) -> "DataPlatformUrn":
+        return cls(id)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def platform_name(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import OwnershipTypeKeyClass
+    from datahub.metadata.schema_classes import CorpUserKeyClass
 
-class OwnershipTypeUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "ownershipType"
+class CorpUserUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["corpuser"]] = "corpuser"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["OwnershipTypeUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, username: Union["CorpUserUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
+            if isinstance(username, str):
+                if username.startswith('urn:li:'):
                     try:
-                        id = OwnershipTypeUrn.from_string(id)
+                        username = CorpUserUrn.from_string(username)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a OwnershipTypeUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a CorpUserUrn but got {username}')
                 else:
-                    id = UrnEncoder.encode_string(id)
+                    username = UrnEncoder.encode_string(username)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("OwnershipTypeUrn id cannot be empty")
-        if isinstance(id, OwnershipTypeUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a OwnershipTypeUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'OwnershipTypeUrn id contains reserved characters')
+        if not username:
+            raise InvalidUrnError("CorpUserUrn username cannot be empty")
+        if isinstance(username, CorpUserUrn):
+            username = username.username
+        elif isinstance(username, Urn):
+            raise InvalidUrnError(f'Expecting a CorpUserUrn but got {username}')
+        if UrnEncoder.contains_reserved_char(username):
+            raise InvalidUrnError(f'CorpUserUrn username contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [username])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "OwnershipTypeUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "CorpUserUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"OwnershipTypeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"CorpUserUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(username=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["OwnershipTypeKeyClass"]:
-        from datahub.metadata.schema_classes import OwnershipTypeKeyClass
+    def underlying_key_aspect_type(cls) -> Type["CorpUserKeyClass"]:
+        from datahub.metadata.schema_classes import CorpUserKeyClass
 
-        return OwnershipTypeKeyClass
+        return CorpUserKeyClass
 
-    def to_key_aspect(self) -> "OwnershipTypeKeyClass":
-        from datahub.metadata.schema_classes import OwnershipTypeKeyClass
+    def to_key_aspect(self) -> "CorpUserKeyClass":
+        from datahub.metadata.schema_classes import CorpUserKeyClass
 
-        return OwnershipTypeKeyClass(id=self.id)
+        return CorpUserKeyClass(username=self.username)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "OwnershipTypeKeyClass") -> "OwnershipTypeUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "CorpUserKeyClass") -> "CorpUserUrn":
+        return cls(username=key_aspect.username)
+
+    @classmethod
+    @deprecated(reason="Use the constructor instead")
+    def create_from_id(cls, id: str) -> "CorpUserUrn":
+        return cls(id)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def username(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import SchemaFieldKeyClass
+    from datahub.metadata.schema_classes import DashboardKeyClass
 
-class SchemaFieldUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "schemaField"
+class DashboardUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dashboard"]] = "dashboard"
     _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, parent: Union["Urn", str], field_path: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, dashboard_tool: str, dashboard_id: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(parent, str):
-                if parent.startswith('urn:li:'):
-                    try:
-                        parent = Urn.from_string(parent)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a Urn but got {parent}')
-                else:
-                    parent = UrnEncoder.encode_string(parent)
-            field_path = UrnEncoder.encode_string(field_path)
+            dashboard_tool = UrnEncoder.encode_string(dashboard_tool)
+            dashboard_id = UrnEncoder.encode_string(dashboard_id)
 
         # Validation logic.
-        if not parent:
-            raise InvalidUrnError("SchemaFieldUrn parent cannot be empty")
-        parent = str(parent)  # convert urn type to str
-        assert Urn.from_string(parent)
-        if not field_path:
-            raise InvalidUrnError("SchemaFieldUrn field_path cannot be empty")
-        if UrnEncoder.contains_reserved_char(field_path):
-            raise InvalidUrnError(f'SchemaFieldUrn field_path contains reserved characters')
+        if not dashboard_tool:
+            raise InvalidUrnError("DashboardUrn dashboard_tool cannot be empty")
+        if UrnEncoder.contains_reserved_char(dashboard_tool):
+            raise InvalidUrnError(f'DashboardUrn dashboard_tool contains reserved characters')
+        if not dashboard_id:
+            raise InvalidUrnError("DashboardUrn dashboard_id cannot be empty")
+        if UrnEncoder.contains_reserved_char(dashboard_id):
+            raise InvalidUrnError(f'DashboardUrn dashboard_id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [parent, field_path])
+        super().__init__(self.ENTITY_TYPE, [dashboard_tool, dashboard_id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "SchemaFieldUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DashboardUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"SchemaFieldUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(parent=entity_ids[0], field_path=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"DashboardUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(dashboard_tool=entity_ids[0], dashboard_id=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["SchemaFieldKeyClass"]:
-        from datahub.metadata.schema_classes import SchemaFieldKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DashboardKeyClass"]:
+        from datahub.metadata.schema_classes import DashboardKeyClass
 
-        return SchemaFieldKeyClass
+        return DashboardKeyClass
 
-    def to_key_aspect(self) -> "SchemaFieldKeyClass":
-        from datahub.metadata.schema_classes import SchemaFieldKeyClass
+    def to_key_aspect(self) -> "DashboardKeyClass":
+        from datahub.metadata.schema_classes import DashboardKeyClass
 
-        return SchemaFieldKeyClass(parent=self.parent, fieldPath=self.field_path)
+        return DashboardKeyClass(dashboardTool=self.dashboard_tool, dashboardId=self.dashboard_id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "SchemaFieldKeyClass") -> "SchemaFieldUrn":
-        return cls(parent=key_aspect.parent, field_path=key_aspect.fieldPath)
+    def from_key_aspect(cls, key_aspect: "DashboardKeyClass") -> "DashboardUrn":
+        return cls(dashboard_tool=key_aspect.dashboardTool, dashboard_id=key_aspect.dashboardId)
 
+    @classmethod
+    def create_from_ids(
+        cls,
+        platform: str,
+        name: str,
+        platform_instance: Optional[str] = None,
+    ) -> "DashboardUrn":
+        return DashboardUrn(
+            dashboard_tool=platform,
+            dashboard_id=f"{platform_instance}.{name}" if platform_instance else name,
+        )
+        
     @property
-    def parent(self) -> str:
-        return self.entity_ids[0]
+    def dashboard_tool(self) -> str:
+        return self._entity_ids[0]
 
     @property
-    def field_path(self) -> str:
-        return self.entity_ids[1]
+    def dashboard_id(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import MLFeatureTableKeyClass
+    from datahub.metadata.schema_classes import MLPrimaryKeyKeyClass
 
-class MlFeatureTableUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "mlFeatureTable"
+class MlPrimaryKeyUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["mlPrimaryKey"]] = "mlPrimaryKey"
     _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, platform: Union["DataPlatformUrn", str], name: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, feature_namespace: str, name: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            platform = DataPlatformUrn(platform).urn()
+            feature_namespace = UrnEncoder.encode_string(feature_namespace)
             name = UrnEncoder.encode_string(name)
 
         # Validation logic.
-        if not platform:
-            raise InvalidUrnError("MlFeatureTableUrn platform cannot be empty")
-        platform = str(platform)  # convert urn type to str
-        assert DataPlatformUrn.from_string(platform)
+        if not feature_namespace:
+            raise InvalidUrnError("MlPrimaryKeyUrn feature_namespace cannot be empty")
+        if UrnEncoder.contains_reserved_char(feature_namespace):
+            raise InvalidUrnError(f'MlPrimaryKeyUrn feature_namespace contains reserved characters')
         if not name:
-            raise InvalidUrnError("MlFeatureTableUrn name cannot be empty")
+            raise InvalidUrnError("MlPrimaryKeyUrn name cannot be empty")
         if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'MlFeatureTableUrn name contains reserved characters')
+            raise InvalidUrnError(f'MlPrimaryKeyUrn name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [platform, name])
+        super().__init__(self.ENTITY_TYPE, [feature_namespace, name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "MlFeatureTableUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "MlPrimaryKeyUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"MlFeatureTableUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(platform=entity_ids[0], name=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"MlPrimaryKeyUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(feature_namespace=entity_ids[0], name=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["MLFeatureTableKeyClass"]:
-        from datahub.metadata.schema_classes import MLFeatureTableKeyClass
+    def underlying_key_aspect_type(cls) -> Type["MLPrimaryKeyKeyClass"]:
+        from datahub.metadata.schema_classes import MLPrimaryKeyKeyClass
 
-        return MLFeatureTableKeyClass
+        return MLPrimaryKeyKeyClass
 
-    def to_key_aspect(self) -> "MLFeatureTableKeyClass":
-        from datahub.metadata.schema_classes import MLFeatureTableKeyClass
+    def to_key_aspect(self) -> "MLPrimaryKeyKeyClass":
+        from datahub.metadata.schema_classes import MLPrimaryKeyKeyClass
 
-        return MLFeatureTableKeyClass(platform=self.platform, name=self.name)
+        return MLPrimaryKeyKeyClass(featureNamespace=self.feature_namespace, name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "MLFeatureTableKeyClass") -> "MlFeatureTableUrn":
-        return cls(platform=key_aspect.platform, name=key_aspect.name)
+    def from_key_aspect(cls, key_aspect: "MLPrimaryKeyKeyClass") -> "MlPrimaryKeyUrn":
+        return cls(feature_namespace=key_aspect.featureNamespace, name=key_aspect.name)
 
     @property
-    def platform(self) -> str:
-        return self.entity_ids[0]
+    def feature_namespace(self) -> str:
+        return self._entity_ids[0]
 
     @property
     def name(self) -> str:
-        return self.entity_ids[1]
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DashboardKeyClass
+    from datahub.metadata.schema_classes import QueryKeyClass
 
-class DashboardUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dashboard"
-    _URN_PARTS: ClassVar[int] = 2
+class QueryUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["query"]] = "query"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, dashboard_tool: str, dashboard_id: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["QueryUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            dashboard_tool = UrnEncoder.encode_string(dashboard_tool)
-            dashboard_id = UrnEncoder.encode_string(dashboard_id)
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = QueryUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a QueryUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not dashboard_tool:
-            raise InvalidUrnError("DashboardUrn dashboard_tool cannot be empty")
-        if UrnEncoder.contains_reserved_char(dashboard_tool):
-            raise InvalidUrnError(f'DashboardUrn dashboard_tool contains reserved characters')
-        if not dashboard_id:
-            raise InvalidUrnError("DashboardUrn dashboard_id cannot be empty")
-        if UrnEncoder.contains_reserved_char(dashboard_id):
-            raise InvalidUrnError(f'DashboardUrn dashboard_id contains reserved characters')
+        if not id:
+            raise InvalidUrnError("QueryUrn id cannot be empty")
+        if isinstance(id, QueryUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a QueryUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'QueryUrn id contains reserved characters')
+
+        super().__init__(self.ENTITY_TYPE, [id])
+
+    @classmethod
+    def _parse_ids(cls, entity_ids: List[str]) -> "QueryUrn":
+        if len(entity_ids) != cls._URN_PARTS:
+            raise InvalidUrnError(f"QueryUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
+
+    @classmethod
+    def underlying_key_aspect_type(cls) -> Type["QueryKeyClass"]:
+        from datahub.metadata.schema_classes import QueryKeyClass
+
+        return QueryKeyClass
+
+    def to_key_aspect(self) -> "QueryKeyClass":
+        from datahub.metadata.schema_classes import QueryKeyClass
+
+        return QueryKeyClass(id=self.id)
+
+    @classmethod
+    def from_key_aspect(cls, key_aspect: "QueryKeyClass") -> "QueryUrn":
+        return cls(id=key_aspect.id)
+
+    @property
+    def id(self) -> str:
+        return self._entity_ids[0]
+
+if TYPE_CHECKING:
+    from datahub.metadata.schema_classes import OwnershipTypeKeyClass
+
+class OwnershipTypeUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["ownershipType"]] = "ownershipType"
+    _URN_PARTS: ClassVar[int] = 1
+
+    def __init__(self, id: Union["OwnershipTypeUrn", str], *, _allow_coercion: bool = True) -> None:
+        if _allow_coercion:
+            # Field coercion logic (if any is required).
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = OwnershipTypeUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a OwnershipTypeUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
-        super().__init__(self.ENTITY_TYPE, [dashboard_tool, dashboard_id])
+        # Validation logic.
+        if not id:
+            raise InvalidUrnError("OwnershipTypeUrn id cannot be empty")
+        if isinstance(id, OwnershipTypeUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a OwnershipTypeUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'OwnershipTypeUrn id contains reserved characters')
+
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DashboardUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "OwnershipTypeUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DashboardUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(dashboard_tool=entity_ids[0], dashboard_id=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"OwnershipTypeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DashboardKeyClass"]:
-        from datahub.metadata.schema_classes import DashboardKeyClass
+    def underlying_key_aspect_type(cls) -> Type["OwnershipTypeKeyClass"]:
+        from datahub.metadata.schema_classes import OwnershipTypeKeyClass
 
-        return DashboardKeyClass
+        return OwnershipTypeKeyClass
 
-    def to_key_aspect(self) -> "DashboardKeyClass":
-        from datahub.metadata.schema_classes import DashboardKeyClass
+    def to_key_aspect(self) -> "OwnershipTypeKeyClass":
+        from datahub.metadata.schema_classes import OwnershipTypeKeyClass
 
-        return DashboardKeyClass(dashboardTool=self.dashboard_tool, dashboardId=self.dashboard_id)
+        return OwnershipTypeKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DashboardKeyClass") -> "DashboardUrn":
-        return cls(dashboard_tool=key_aspect.dashboardTool, dashboard_id=key_aspect.dashboardId)
-
-    @property
-    def dashboard_tool(self) -> str:
-        return self.entity_ids[0]
+    def from_key_aspect(cls, key_aspect: "OwnershipTypeKeyClass") -> "OwnershipTypeUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def dashboard_id(self) -> str:
-        return self.entity_ids[1]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import TelemetryKeyClass
+    from datahub.metadata.schema_classes import DomainKeyClass
 
-class TelemetryUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "telemetry"
+class DomainUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["domain"]] = "domain"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, name: Union["TelemetryUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DomainUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(name, str):
-                if name.startswith('urn:li:'):
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
                     try:
-                        name = TelemetryUrn.from_string(name)
+                        id = DomainUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a TelemetryUrn but got {name}')
+                        raise InvalidUrnError(f'Expecting a DomainUrn but got {id}')
                 else:
-                    name = UrnEncoder.encode_string(name)
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not name:
-            raise InvalidUrnError("TelemetryUrn name cannot be empty")
-        if isinstance(name, TelemetryUrn):
-            name = name.name
-        elif isinstance(name, Urn):
-            raise InvalidUrnError(f'Expecting a TelemetryUrn but got {name}')
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'TelemetryUrn name contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DomainUrn id cannot be empty")
+        if isinstance(id, DomainUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DomainUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DomainUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [name])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "TelemetryUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DomainUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"TelemetryUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(name=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"DomainUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["TelemetryKeyClass"]:
-        from datahub.metadata.schema_classes import TelemetryKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DomainKeyClass"]:
+        from datahub.metadata.schema_classes import DomainKeyClass
 
-        return TelemetryKeyClass
+        return DomainKeyClass
 
-    def to_key_aspect(self) -> "TelemetryKeyClass":
-        from datahub.metadata.schema_classes import TelemetryKeyClass
+    def to_key_aspect(self) -> "DomainKeyClass":
+        from datahub.metadata.schema_classes import DomainKeyClass
 
-        return TelemetryKeyClass(name=self.name)
+        return DomainKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "TelemetryKeyClass") -> "TelemetryUrn":
-        return cls(name=key_aspect.name)
+    def from_key_aspect(cls, key_aspect: "DomainKeyClass") -> "DomainUrn":
+        return cls(id=key_aspect.id)
+
+    @classmethod
+    @deprecated(reason="Use the constructor instead")
+    def create_from_id(cls, id: str) -> "DomainUrn":
+        return cls(id)
 
     @property
-    def name(self) -> str:
-        return self.entity_ids[0]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
     from datahub.metadata.schema_classes import MLFeatureKeyClass
 
 class MlFeatureUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "mlFeature"
+    ENTITY_TYPE: ClassVar[Literal["mlFeature"]] = "mlFeature"
     _URN_PARTS: ClassVar[int] = 2
 
     def __init__(self, feature_namespace: str, name: str, *, _allow_coercion: bool = True) -> None:
@@ -1720,73 +1787,71 @@ class MlFeatureUrn(_SpecificUrn):
 
     @property
     def feature_namespace(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
     @property
     def name(self) -> str:
-        return self.entity_ids[1]
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubStepStateKeyClass
+    from datahub.metadata.schema_classes import MLFeatureTableKeyClass
 
-class DataHubStepStateUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubStepState"
-    _URN_PARTS: ClassVar[int] = 1
+class MlFeatureTableUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["mlFeatureTable"]] = "mlFeatureTable"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, id: Union["DataHubStepStateUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, platform: Union["DataPlatformUrn", str], name: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
-                    try:
-                        id = DataHubStepStateUrn.from_string(id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubStepStateUrn but got {id}')
-                else:
-                    id = UrnEncoder.encode_string(id)
+            platform = DataPlatformUrn(platform).urn()
+            name = UrnEncoder.encode_string(name)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataHubStepStateUrn id cannot be empty")
-        if isinstance(id, DataHubStepStateUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubStepStateUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubStepStateUrn id contains reserved characters')
+        if not platform:
+            raise InvalidUrnError("MlFeatureTableUrn platform cannot be empty")
+        platform = str(platform)  # convert urn type to str
+        assert DataPlatformUrn.from_string(platform)
+        if not name:
+            raise InvalidUrnError("MlFeatureTableUrn name cannot be empty")
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'MlFeatureTableUrn name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [platform, name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubStepStateUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "MlFeatureTableUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubStepStateUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"MlFeatureTableUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(platform=entity_ids[0], name=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubStepStateKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubStepStateKeyClass
+    def underlying_key_aspect_type(cls) -> Type["MLFeatureTableKeyClass"]:
+        from datahub.metadata.schema_classes import MLFeatureTableKeyClass
 
-        return DataHubStepStateKeyClass
+        return MLFeatureTableKeyClass
 
-    def to_key_aspect(self) -> "DataHubStepStateKeyClass":
-        from datahub.metadata.schema_classes import DataHubStepStateKeyClass
+    def to_key_aspect(self) -> "MLFeatureTableKeyClass":
+        from datahub.metadata.schema_classes import MLFeatureTableKeyClass
 
-        return DataHubStepStateKeyClass(id=self.id)
+        return MLFeatureTableKeyClass(platform=self.platform, name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubStepStateKeyClass") -> "DataHubStepStateUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "MLFeatureTableKeyClass") -> "MlFeatureTableUrn":
+        return cls(platform=key_aspect.platform, name=key_aspect.name)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def platform(self) -> str:
+        return self._entity_ids[0]
+
+    @property
+    def name(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
     from datahub.metadata.schema_classes import DataHubViewKeyClass
 
 class DataHubViewUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubView"
+    ENTITY_TYPE: ClassVar[Literal["dataHubView"]] = "dataHubView"
     _URN_PARTS: ClassVar[int] = 1
 
     def __init__(self, id: Union["DataHubViewUrn", str], *, _allow_coercion: bool = True) -> None:
@@ -1836,953 +1901,933 @@ class DataHubViewUrn(_SpecificUrn):
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubRetentionKeyClass
+    from datahub.metadata.schema_classes import DataHubActionKeyClass
 
-class DataHubRetentionUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubRetention"
-    _URN_PARTS: ClassVar[int] = 2
+class DataHubActionUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubAction"]] = "dataHubAction"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, entity_name: str, aspect_name: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubActionUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            entity_name = UrnEncoder.encode_string(entity_name)
-            aspect_name = UrnEncoder.encode_string(aspect_name)
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = DataHubActionUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a DataHubActionUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not entity_name:
-            raise InvalidUrnError("DataHubRetentionUrn entity_name cannot be empty")
-        if UrnEncoder.contains_reserved_char(entity_name):
-            raise InvalidUrnError(f'DataHubRetentionUrn entity_name contains reserved characters')
-        if not aspect_name:
-            raise InvalidUrnError("DataHubRetentionUrn aspect_name cannot be empty")
-        if UrnEncoder.contains_reserved_char(aspect_name):
-            raise InvalidUrnError(f'DataHubRetentionUrn aspect_name contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DataHubActionUrn id cannot be empty")
+        if isinstance(id, DataHubActionUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataHubActionUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataHubActionUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [entity_name, aspect_name])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubRetentionUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubActionUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubRetentionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(entity_name=entity_ids[0], aspect_name=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"DataHubActionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubRetentionKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubRetentionKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubActionKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubActionKeyClass
 
-        return DataHubRetentionKeyClass
+        return DataHubActionKeyClass
 
-    def to_key_aspect(self) -> "DataHubRetentionKeyClass":
-        from datahub.metadata.schema_classes import DataHubRetentionKeyClass
+    def to_key_aspect(self) -> "DataHubActionKeyClass":
+        from datahub.metadata.schema_classes import DataHubActionKeyClass
 
-        return DataHubRetentionKeyClass(entityName=self.entity_name, aspectName=self.aspect_name)
+        return DataHubActionKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubRetentionKeyClass") -> "DataHubRetentionUrn":
-        return cls(entity_name=key_aspect.entityName, aspect_name=key_aspect.aspectName)
-
-    @property
-    def entity_name(self) -> str:
-        return self.entity_ids[0]
+    def from_key_aspect(cls, key_aspect: "DataHubActionKeyClass") -> "DataHubActionUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def aspect_name(self) -> str:
-        return self.entity_ids[1]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import MLPrimaryKeyKeyClass
+    from datahub.metadata.schema_classes import DataHubUpgradeKeyClass
 
-class MlPrimaryKeyUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "mlPrimaryKey"
-    _URN_PARTS: ClassVar[int] = 2
+class DataHubUpgradeUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubUpgrade"]] = "dataHubUpgrade"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, feature_namespace: str, name: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubUpgradeUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            feature_namespace = UrnEncoder.encode_string(feature_namespace)
-            name = UrnEncoder.encode_string(name)
-
-        # Validation logic.
-        if not feature_namespace:
-            raise InvalidUrnError("MlPrimaryKeyUrn feature_namespace cannot be empty")
-        if UrnEncoder.contains_reserved_char(feature_namespace):
-            raise InvalidUrnError(f'MlPrimaryKeyUrn feature_namespace contains reserved characters')
-        if not name:
-            raise InvalidUrnError("MlPrimaryKeyUrn name cannot be empty")
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'MlPrimaryKeyUrn name contains reserved characters')
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = DataHubUpgradeUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a DataHubUpgradeUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
-        super().__init__(self.ENTITY_TYPE, [feature_namespace, name])
+        # Validation logic.
+        if not id:
+            raise InvalidUrnError("DataHubUpgradeUrn id cannot be empty")
+        if isinstance(id, DataHubUpgradeUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataHubUpgradeUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataHubUpgradeUrn id contains reserved characters')
+
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "MlPrimaryKeyUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubUpgradeUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"MlPrimaryKeyUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(feature_namespace=entity_ids[0], name=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"DataHubUpgradeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["MLPrimaryKeyKeyClass"]:
-        from datahub.metadata.schema_classes import MLPrimaryKeyKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubUpgradeKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubUpgradeKeyClass
 
-        return MLPrimaryKeyKeyClass
+        return DataHubUpgradeKeyClass
 
-    def to_key_aspect(self) -> "MLPrimaryKeyKeyClass":
-        from datahub.metadata.schema_classes import MLPrimaryKeyKeyClass
+    def to_key_aspect(self) -> "DataHubUpgradeKeyClass":
+        from datahub.metadata.schema_classes import DataHubUpgradeKeyClass
 
-        return MLPrimaryKeyKeyClass(featureNamespace=self.feature_namespace, name=self.name)
+        return DataHubUpgradeKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "MLPrimaryKeyKeyClass") -> "MlPrimaryKeyUrn":
-        return cls(feature_namespace=key_aspect.featureNamespace, name=key_aspect.name)
-
-    @property
-    def feature_namespace(self) -> str:
-        return self.entity_ids[0]
+    def from_key_aspect(cls, key_aspect: "DataHubUpgradeKeyClass") -> "DataHubUpgradeUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def name(self) -> str:
-        return self.entity_ids[1]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataFlowKeyClass
+    from datahub.metadata.schema_classes import DataHubStepStateKeyClass
 
-class DataFlowUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataFlow"
-    _URN_PARTS: ClassVar[int] = 3
+class DataHubStepStateUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubStepState"]] = "dataHubStepState"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, orchestrator: str, flow_id: str, cluster: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubStepStateUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            orchestrator = UrnEncoder.encode_string(orchestrator)
-            flow_id = UrnEncoder.encode_string(flow_id)
-            cluster = UrnEncoder.encode_string(cluster)
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = DataHubStepStateUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a DataHubStepStateUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not orchestrator:
-            raise InvalidUrnError("DataFlowUrn orchestrator cannot be empty")
-        if UrnEncoder.contains_reserved_char(orchestrator):
-            raise InvalidUrnError(f'DataFlowUrn orchestrator contains reserved characters')
-        if not flow_id:
-            raise InvalidUrnError("DataFlowUrn flow_id cannot be empty")
-        if UrnEncoder.contains_reserved_char(flow_id):
-            raise InvalidUrnError(f'DataFlowUrn flow_id contains reserved characters')
-        if not cluster:
-            raise InvalidUrnError("DataFlowUrn cluster cannot be empty")
-        if UrnEncoder.contains_reserved_char(cluster):
-            raise InvalidUrnError(f'DataFlowUrn cluster contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DataHubStepStateUrn id cannot be empty")
+        if isinstance(id, DataHubStepStateUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataHubStepStateUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataHubStepStateUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [orchestrator, flow_id, cluster])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataFlowUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubStepStateUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataFlowUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(orchestrator=entity_ids[0], flow_id=entity_ids[1], cluster=entity_ids[2], _allow_coercion=False)
+            raise InvalidUrnError(f"DataHubStepStateUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataFlowKeyClass"]:
-        from datahub.metadata.schema_classes import DataFlowKeyClass
-
-        return DataFlowKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubStepStateKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubStepStateKeyClass
 
-    def to_key_aspect(self) -> "DataFlowKeyClass":
-        from datahub.metadata.schema_classes import DataFlowKeyClass
+        return DataHubStepStateKeyClass
 
-        return DataFlowKeyClass(orchestrator=self.orchestrator, flowId=self.flow_id, cluster=self.cluster)
+    def to_key_aspect(self) -> "DataHubStepStateKeyClass":
+        from datahub.metadata.schema_classes import DataHubStepStateKeyClass
 
-    @classmethod
-    def from_key_aspect(cls, key_aspect: "DataFlowKeyClass") -> "DataFlowUrn":
-        return cls(orchestrator=key_aspect.orchestrator, flow_id=key_aspect.flowId, cluster=key_aspect.cluster)
+        return DataHubStepStateKeyClass(id=self.id)
 
     @classmethod
-    def create_from_ids(
-        cls,
-        orchestrator: str,
-        flow_id: str,
-        env: str,
-        platform_instance: Optional[str] = None,
-    ) -> "DataFlowUrn":
-        return cls(
-            orchestrator=orchestrator,
-            flow_id=f"{platform_instance}.{flow_id}" if platform_instance else flow_id,
-            cluster=env,
-        )
-
-    @deprecated(reason="Use .orchestrator instead")
-    def get_orchestrator_name(self) -> str:
-        return self.orchestrator
-
-    @deprecated(reason="Use .flow_id instead")
-    def get_flow_id(self) -> str:
-        return self.flow_id
-
-    @deprecated(reason="Use .cluster instead")
-    def get_env(self) -> str:
-        return self.cluster
-
-    @property
-    def orchestrator(self) -> str:
-        return self.entity_ids[0]
-
-    @property
-    def flow_id(self) -> str:
-        return self.entity_ids[1]
+    def from_key_aspect(cls, key_aspect: "DataHubStepStateKeyClass") -> "DataHubStepStateUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def cluster(self) -> str:
-        return self.entity_ids[2]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import CorpUserKeyClass
+    from datahub.metadata.schema_classes import ERModelRelationshipKeyClass
 
-class CorpUserUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "corpuser"
+class ErModelRelationshipUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["erModelRelationship"]] = "erModelRelationship"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, username: Union["CorpUserUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["ErModelRelationshipUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(username, str):
-                if username.startswith('urn:li:'):
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
                     try:
-                        username = CorpUserUrn.from_string(username)
+                        id = ErModelRelationshipUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a CorpUserUrn but got {username}')
+                        raise InvalidUrnError(f'Expecting a ErModelRelationshipUrn but got {id}')
                 else:
-                    username = UrnEncoder.encode_string(username)
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not username:
-            raise InvalidUrnError("CorpUserUrn username cannot be empty")
-        if isinstance(username, CorpUserUrn):
-            username = username.username
-        elif isinstance(username, Urn):
-            raise InvalidUrnError(f'Expecting a CorpUserUrn but got {username}')
-        if UrnEncoder.contains_reserved_char(username):
-            raise InvalidUrnError(f'CorpUserUrn username contains reserved characters')
+        if not id:
+            raise InvalidUrnError("ErModelRelationshipUrn id cannot be empty")
+        if isinstance(id, ErModelRelationshipUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a ErModelRelationshipUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'ErModelRelationshipUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [username])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "CorpUserUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "ErModelRelationshipUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"CorpUserUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(username=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"ErModelRelationshipUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["CorpUserKeyClass"]:
-        from datahub.metadata.schema_classes import CorpUserKeyClass
-
-        return CorpUserKeyClass
+    def underlying_key_aspect_type(cls) -> Type["ERModelRelationshipKeyClass"]:
+        from datahub.metadata.schema_classes import ERModelRelationshipKeyClass
 
-    def to_key_aspect(self) -> "CorpUserKeyClass":
-        from datahub.metadata.schema_classes import CorpUserKeyClass
+        return ERModelRelationshipKeyClass
 
-        return CorpUserKeyClass(username=self.username)
+    def to_key_aspect(self) -> "ERModelRelationshipKeyClass":
+        from datahub.metadata.schema_classes import ERModelRelationshipKeyClass
 
-    @classmethod
-    def from_key_aspect(cls, key_aspect: "CorpUserKeyClass") -> "CorpUserUrn":
-        return cls(username=key_aspect.username)
+        return ERModelRelationshipKeyClass(id=self.id)
 
     @classmethod
-    @deprecated(reason="Use the constructor instead")
-    def create_from_id(cls, id: str) -> "CorpUserUrn":
-        return cls(id)
+    def from_key_aspect(cls, key_aspect: "ERModelRelationshipKeyClass") -> "ErModelRelationshipUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def username(self) -> str:
-        return self.entity_ids[0]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import InviteTokenKeyClass
+    from datahub.metadata.schema_classes import DataHubPolicyKeyClass
 
-class InviteTokenUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "inviteToken"
+class DataHubPolicyUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubPolicy"]] = "dataHubPolicy"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["InviteTokenUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubPolicyUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = InviteTokenUrn.from_string(id)
+                        id = DataHubPolicyUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a InviteTokenUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a DataHubPolicyUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("InviteTokenUrn id cannot be empty")
-        if isinstance(id, InviteTokenUrn):
+            raise InvalidUrnError("DataHubPolicyUrn id cannot be empty")
+        if isinstance(id, DataHubPolicyUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a InviteTokenUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a DataHubPolicyUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'InviteTokenUrn id contains reserved characters')
+            raise InvalidUrnError(f'DataHubPolicyUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "InviteTokenUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubPolicyUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"InviteTokenUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"DataHubPolicyUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["InviteTokenKeyClass"]:
-        from datahub.metadata.schema_classes import InviteTokenKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubPolicyKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubPolicyKeyClass
 
-        return InviteTokenKeyClass
+        return DataHubPolicyKeyClass
 
-    def to_key_aspect(self) -> "InviteTokenKeyClass":
-        from datahub.metadata.schema_classes import InviteTokenKeyClass
+    def to_key_aspect(self) -> "DataHubPolicyKeyClass":
+        from datahub.metadata.schema_classes import DataHubPolicyKeyClass
 
-        return InviteTokenKeyClass(id=self.id)
+        return DataHubPolicyKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "InviteTokenKeyClass") -> "InviteTokenUrn":
+    def from_key_aspect(cls, key_aspect: "DataHubPolicyKeyClass") -> "DataHubPolicyUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataPlatformKeyClass
+    from datahub.metadata.schema_classes import DataHubRetentionKeyClass
 
-class DataPlatformUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataPlatform"
-    _URN_PARTS: ClassVar[int] = 1
+class DataHubRetentionUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubRetention"]] = "dataHubRetention"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, platform_name: Union["DataPlatformUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, entity_name: str, aspect_name: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(platform_name, str):
-                if platform_name.startswith('urn:li:'):
-                    try:
-                        platform_name = DataPlatformUrn.from_string(platform_name)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataPlatformUrn but got {platform_name}')
-                else:
-                    platform_name = UrnEncoder.encode_string(platform_name)
+            entity_name = UrnEncoder.encode_string(entity_name)
+            aspect_name = UrnEncoder.encode_string(aspect_name)
 
         # Validation logic.
-        if not platform_name:
-            raise InvalidUrnError("DataPlatformUrn platform_name cannot be empty")
-        if isinstance(platform_name, DataPlatformUrn):
-            platform_name = platform_name.platform_name
-        elif isinstance(platform_name, Urn):
-            raise InvalidUrnError(f'Expecting a DataPlatformUrn but got {platform_name}')
-        if UrnEncoder.contains_reserved_char(platform_name):
-            raise InvalidUrnError(f'DataPlatformUrn platform_name contains reserved characters')
+        if not entity_name:
+            raise InvalidUrnError("DataHubRetentionUrn entity_name cannot be empty")
+        if UrnEncoder.contains_reserved_char(entity_name):
+            raise InvalidUrnError(f'DataHubRetentionUrn entity_name contains reserved characters')
+        if not aspect_name:
+            raise InvalidUrnError("DataHubRetentionUrn aspect_name cannot be empty")
+        if UrnEncoder.contains_reserved_char(aspect_name):
+            raise InvalidUrnError(f'DataHubRetentionUrn aspect_name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [platform_name])
+        super().__init__(self.ENTITY_TYPE, [entity_name, aspect_name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataPlatformUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubRetentionUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataPlatformUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(platform_name=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"DataHubRetentionUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(entity_name=entity_ids[0], aspect_name=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataPlatformKeyClass"]:
-        from datahub.metadata.schema_classes import DataPlatformKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubRetentionKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubRetentionKeyClass
 
-        return DataPlatformKeyClass
+        return DataHubRetentionKeyClass
 
-    def to_key_aspect(self) -> "DataPlatformKeyClass":
-        from datahub.metadata.schema_classes import DataPlatformKeyClass
+    def to_key_aspect(self) -> "DataHubRetentionKeyClass":
+        from datahub.metadata.schema_classes import DataHubRetentionKeyClass
 
-        return DataPlatformKeyClass(platformName=self.platform_name)
+        return DataHubRetentionKeyClass(entityName=self.entity_name, aspectName=self.aspect_name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataPlatformKeyClass") -> "DataPlatformUrn":
-        return cls(platform_name=key_aspect.platformName)
+    def from_key_aspect(cls, key_aspect: "DataHubRetentionKeyClass") -> "DataHubRetentionUrn":
+        return cls(entity_name=key_aspect.entityName, aspect_name=key_aspect.aspectName)
 
-    @classmethod
-    @deprecated(reason="Use the constructor instead")
-    def create_from_id(cls, id: str) -> "DataPlatformUrn":
-        return cls(id)
+    @property
+    def entity_name(self) -> str:
+        return self._entity_ids[0]
 
     @property
-    def platform_name(self) -> str:
-        return self.entity_ids[0]
+    def aspect_name(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import ContainerKeyClass
+    from datahub.metadata.schema_classes import DataContractKeyClass
 
-class ContainerUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "container"
+class DataContractUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataContract"]] = "dataContract"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, guid: Union["ContainerUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataContractUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(guid, str):
-                if guid.startswith('urn:li:'):
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
                     try:
-                        guid = ContainerUrn.from_string(guid)
+                        id = DataContractUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a ContainerUrn but got {guid}')
+                        raise InvalidUrnError(f'Expecting a DataContractUrn but got {id}')
                 else:
-                    guid = UrnEncoder.encode_string(guid)
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not guid:
-            raise InvalidUrnError("ContainerUrn guid cannot be empty")
-        if isinstance(guid, ContainerUrn):
-            guid = guid.guid
-        elif isinstance(guid, Urn):
-            raise InvalidUrnError(f'Expecting a ContainerUrn but got {guid}')
-        if UrnEncoder.contains_reserved_char(guid):
-            raise InvalidUrnError(f'ContainerUrn guid contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DataContractUrn id cannot be empty")
+        if isinstance(id, DataContractUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataContractUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataContractUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [guid])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "ContainerUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataContractUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"ContainerUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(guid=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"DataContractUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["ContainerKeyClass"]:
-        from datahub.metadata.schema_classes import ContainerKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataContractKeyClass"]:
+        from datahub.metadata.schema_classes import DataContractKeyClass
 
-        return ContainerKeyClass
+        return DataContractKeyClass
 
-    def to_key_aspect(self) -> "ContainerKeyClass":
-        from datahub.metadata.schema_classes import ContainerKeyClass
+    def to_key_aspect(self) -> "DataContractKeyClass":
+        from datahub.metadata.schema_classes import DataContractKeyClass
 
-        return ContainerKeyClass(guid=self.guid)
+        return DataContractKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "ContainerKeyClass") -> "ContainerUrn":
-        return cls(guid=key_aspect.guid)
+    def from_key_aspect(cls, key_aspect: "DataContractKeyClass") -> "DataContractUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def guid(self) -> str:
-        return self.entity_ids[0]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataPlatformInstanceKeyClass
+    from datahub.metadata.schema_classes import DataProcessKeyClass
 
-class DataPlatformInstanceUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataPlatformInstance"
-    _URN_PARTS: ClassVar[int] = 2
+class DataProcessUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataProcess"]] = "dataProcess"
+    _URN_PARTS: ClassVar[int] = 3
 
-    def __init__(self, platform: Union["DataPlatformUrn", str], instance: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, name: str, orchestrator: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            platform = DataPlatformUrn(platform).urn()
-            instance = UrnEncoder.encode_string(instance)
+            name = UrnEncoder.encode_string(name)
+            orchestrator = UrnEncoder.encode_string(orchestrator)
+            env = env.upper()
 
         # Validation logic.
-        if not platform:
-            raise InvalidUrnError("DataPlatformInstanceUrn platform cannot be empty")
-        platform = str(platform)  # convert urn type to str
-        assert DataPlatformUrn.from_string(platform)
-        if not instance:
-            raise InvalidUrnError("DataPlatformInstanceUrn instance cannot be empty")
-        if UrnEncoder.contains_reserved_char(instance):
-            raise InvalidUrnError(f'DataPlatformInstanceUrn instance contains reserved characters')
+        if not name:
+            raise InvalidUrnError("DataProcessUrn name cannot be empty")
+        if UrnEncoder.contains_reserved_char(name):
+            raise InvalidUrnError(f'DataProcessUrn name contains reserved characters')
+        if not orchestrator:
+            raise InvalidUrnError("DataProcessUrn orchestrator cannot be empty")
+        if UrnEncoder.contains_reserved_char(orchestrator):
+            raise InvalidUrnError(f'DataProcessUrn orchestrator contains reserved characters')
+        if not env:
+            raise InvalidUrnError("DataProcessUrn env cannot be empty")
+        if UrnEncoder.contains_reserved_char(env):
+            raise InvalidUrnError(f'DataProcessUrn env contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [platform, instance])
+        super().__init__(self.ENTITY_TYPE, [name, orchestrator, env])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataPlatformInstanceUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataProcessUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataPlatformInstanceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(platform=entity_ids[0], instance=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"DataProcessUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(name=entity_ids[0], orchestrator=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataPlatformInstanceKeyClass"]:
-        from datahub.metadata.schema_classes import DataPlatformInstanceKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataProcessKeyClass"]:
+        from datahub.metadata.schema_classes import DataProcessKeyClass
 
-        return DataPlatformInstanceKeyClass
+        return DataProcessKeyClass
 
-    def to_key_aspect(self) -> "DataPlatformInstanceKeyClass":
-        from datahub.metadata.schema_classes import DataPlatformInstanceKeyClass
+    def to_key_aspect(self) -> "DataProcessKeyClass":
+        from datahub.metadata.schema_classes import DataProcessKeyClass
 
-        return DataPlatformInstanceKeyClass(platform=self.platform, instance=self.instance)
+        return DataProcessKeyClass(name=self.name, orchestrator=self.orchestrator, origin=self.env)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataPlatformInstanceKeyClass") -> "DataPlatformInstanceUrn":
-        return cls(platform=key_aspect.platform, instance=key_aspect.instance)
+    def from_key_aspect(cls, key_aspect: "DataProcessKeyClass") -> "DataProcessUrn":
+        return cls(name=key_aspect.name, orchestrator=key_aspect.orchestrator, env=key_aspect.origin)
 
     @property
-    def platform(self) -> str:
-        return self.entity_ids[0]
+    def name(self) -> str:
+        return self._entity_ids[0]
 
     @property
-    def instance(self) -> str:
-        return self.entity_ids[1]
+    def orchestrator(self) -> str:
+        return self._entity_ids[1]
+
+    @property
+    def env(self) -> str:
+        return self._entity_ids[2]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import GlossaryNodeKeyClass
+    from datahub.metadata.schema_classes import DataProcessInstanceKeyClass
 
-class GlossaryNodeUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "glossaryNode"
+class DataProcessInstanceUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataProcessInstance"]] = "dataProcessInstance"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, name: Union["GlossaryNodeUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataProcessInstanceUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(name, str):
-                if name.startswith('urn:li:'):
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
                     try:
-                        name = GlossaryNodeUrn.from_string(name)
+                        id = DataProcessInstanceUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a GlossaryNodeUrn but got {name}')
+                        raise InvalidUrnError(f'Expecting a DataProcessInstanceUrn but got {id}')
                 else:
-                    name = UrnEncoder.encode_string(name)
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not name:
-            raise InvalidUrnError("GlossaryNodeUrn name cannot be empty")
-        if isinstance(name, GlossaryNodeUrn):
-            name = name.name
-        elif isinstance(name, Urn):
-            raise InvalidUrnError(f'Expecting a GlossaryNodeUrn but got {name}')
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'GlossaryNodeUrn name contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DataProcessInstanceUrn id cannot be empty")
+        if isinstance(id, DataProcessInstanceUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataProcessInstanceUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataProcessInstanceUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [name])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "GlossaryNodeUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataProcessInstanceUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"GlossaryNodeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(name=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"DataProcessInstanceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["GlossaryNodeKeyClass"]:
-        from datahub.metadata.schema_classes import GlossaryNodeKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataProcessInstanceKeyClass"]:
+        from datahub.metadata.schema_classes import DataProcessInstanceKeyClass
 
-        return GlossaryNodeKeyClass
+        return DataProcessInstanceKeyClass
 
-    def to_key_aspect(self) -> "GlossaryNodeKeyClass":
-        from datahub.metadata.schema_classes import GlossaryNodeKeyClass
+    def to_key_aspect(self) -> "DataProcessInstanceKeyClass":
+        from datahub.metadata.schema_classes import DataProcessInstanceKeyClass
 
-        return GlossaryNodeKeyClass(name=self.name)
+        return DataProcessInstanceKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "GlossaryNodeKeyClass") -> "GlossaryNodeUrn":
-        return cls(name=key_aspect.name)
+    def from_key_aspect(cls, key_aspect: "DataProcessInstanceKeyClass") -> "DataProcessInstanceUrn":
+        return cls(id=key_aspect.id)
+
+    @classmethod
+    @deprecated(reason="Use the constructor instead")
+    def create_from_id(cls, id: str) -> "DataProcessInstanceUrn":
+        return cls(id)
+
+    @deprecated(reason="Use .id instead")
+    def get_dataprocessinstance_id(self) -> str:
+        return self.id
 
     @property
-    def name(self) -> str:
-        return self.entity_ids[0]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import MLModelKeyClass
+    from datahub.metadata.schema_classes import GlossaryTermKeyClass
 
-class MlModelUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "mlModel"
-    _URN_PARTS: ClassVar[int] = 3
+class GlossaryTermUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["glossaryTerm"]] = "glossaryTerm"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, platform: Union["DataPlatformUrn", str], name: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
+    def __init__(self, name: Union["GlossaryTermUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            platform = DataPlatformUrn(platform).urn()
-            name = UrnEncoder.encode_string(name)
-            env = env.upper()
+            if isinstance(name, str):
+                if name.startswith('urn:li:'):
+                    try:
+                        name = GlossaryTermUrn.from_string(name)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a GlossaryTermUrn but got {name}')
+                else:
+                    name = UrnEncoder.encode_string(name)
 
         # Validation logic.
-        if not platform:
-            raise InvalidUrnError("MlModelUrn platform cannot be empty")
-        platform = str(platform)  # convert urn type to str
-        assert DataPlatformUrn.from_string(platform)
         if not name:
-            raise InvalidUrnError("MlModelUrn name cannot be empty")
+            raise InvalidUrnError("GlossaryTermUrn name cannot be empty")
+        if isinstance(name, GlossaryTermUrn):
+            name = name.name
+        elif isinstance(name, Urn):
+            raise InvalidUrnError(f'Expecting a GlossaryTermUrn but got {name}')
         if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'MlModelUrn name contains reserved characters')
-        if not env:
-            raise InvalidUrnError("MlModelUrn env cannot be empty")
-        if UrnEncoder.contains_reserved_char(env):
-            raise InvalidUrnError(f'MlModelUrn env contains reserved characters')
+            raise InvalidUrnError(f'GlossaryTermUrn name contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [platform, name, env])
+        super().__init__(self.ENTITY_TYPE, [name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "MlModelUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "GlossaryTermUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"MlModelUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(platform=entity_ids[0], name=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
+            raise InvalidUrnError(f"GlossaryTermUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(name=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["MLModelKeyClass"]:
-        from datahub.metadata.schema_classes import MLModelKeyClass
+    def underlying_key_aspect_type(cls) -> Type["GlossaryTermKeyClass"]:
+        from datahub.metadata.schema_classes import GlossaryTermKeyClass
 
-        return MLModelKeyClass
+        return GlossaryTermKeyClass
 
-    def to_key_aspect(self) -> "MLModelKeyClass":
-        from datahub.metadata.schema_classes import MLModelKeyClass
+    def to_key_aspect(self) -> "GlossaryTermKeyClass":
+        from datahub.metadata.schema_classes import GlossaryTermKeyClass
 
-        return MLModelKeyClass(platform=self.platform, name=self.name, origin=self.env)
+        return GlossaryTermKeyClass(name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "MLModelKeyClass") -> "MlModelUrn":
-        return cls(platform=key_aspect.platform, name=key_aspect.name, env=key_aspect.origin)
-
-    @property
-    def platform(self) -> str:
-        return self.entity_ids[0]
+    def from_key_aspect(cls, key_aspect: "GlossaryTermKeyClass") -> "GlossaryTermUrn":
+        return cls(name=key_aspect.name)
 
     @property
     def name(self) -> str:
-        return self.entity_ids[1]
-
-    @property
-    def env(self) -> str:
-        return self.entity_ids[2]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import TestKeyClass
+    from datahub.metadata.schema_classes import FormKeyClass
 
-class TestUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "test"
+class FormUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["form"]] = "form"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["TestUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["FormUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = TestUrn.from_string(id)
+                        id = FormUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a TestUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a FormUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("TestUrn id cannot be empty")
-        if isinstance(id, TestUrn):
+            raise InvalidUrnError("FormUrn id cannot be empty")
+        if isinstance(id, FormUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a TestUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a FormUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'TestUrn id contains reserved characters')
+            raise InvalidUrnError(f'FormUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "TestUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "FormUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"TestUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"FormUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["TestKeyClass"]:
-        from datahub.metadata.schema_classes import TestKeyClass
+    def underlying_key_aspect_type(cls) -> Type["FormKeyClass"]:
+        from datahub.metadata.schema_classes import FormKeyClass
 
-        return TestKeyClass
+        return FormKeyClass
 
-    def to_key_aspect(self) -> "TestKeyClass":
-        from datahub.metadata.schema_classes import TestKeyClass
+    def to_key_aspect(self) -> "FormKeyClass":
+        from datahub.metadata.schema_classes import FormKeyClass
 
-        return TestKeyClass(id=self.id)
+        return FormKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "TestKeyClass") -> "TestUrn":
+    def from_key_aspect(cls, key_aspect: "FormKeyClass") -> "FormUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import PostKeyClass
+    from datahub.metadata.schema_classes import SchemaFieldKeyClass
 
-class PostUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "post"
-    _URN_PARTS: ClassVar[int] = 1
+class SchemaFieldUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["schemaField"]] = "schemaField"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, id: Union["PostUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, parent: Union["Urn", str], field_path: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
+            if isinstance(parent, str):
+                if parent.startswith('urn:li:'):
                     try:
-                        id = PostUrn.from_string(id)
+                        parent = Urn.from_string(parent)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a PostUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a Urn but got {parent}')
                 else:
-                    id = UrnEncoder.encode_string(id)
+                    parent = UrnEncoder.encode_string(parent)
+            field_path = UrnEncoder.encode_string(field_path)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("PostUrn id cannot be empty")
-        if isinstance(id, PostUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a PostUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'PostUrn id contains reserved characters')
+        if not parent:
+            raise InvalidUrnError("SchemaFieldUrn parent cannot be empty")
+        parent = str(parent)  # convert urn type to str
+        assert Urn.from_string(parent)
+        if not field_path:
+            raise InvalidUrnError("SchemaFieldUrn field_path cannot be empty")
+        if UrnEncoder.contains_reserved_char(field_path):
+            raise InvalidUrnError(f'SchemaFieldUrn field_path contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [parent, field_path])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "PostUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "SchemaFieldUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"PostUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"SchemaFieldUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(parent=entity_ids[0], field_path=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["PostKeyClass"]:
-        from datahub.metadata.schema_classes import PostKeyClass
+    def underlying_key_aspect_type(cls) -> Type["SchemaFieldKeyClass"]:
+        from datahub.metadata.schema_classes import SchemaFieldKeyClass
 
-        return PostKeyClass
+        return SchemaFieldKeyClass
 
-    def to_key_aspect(self) -> "PostKeyClass":
-        from datahub.metadata.schema_classes import PostKeyClass
+    def to_key_aspect(self) -> "SchemaFieldKeyClass":
+        from datahub.metadata.schema_classes import SchemaFieldKeyClass
 
-        return PostKeyClass(id=self.id)
+        return SchemaFieldKeyClass(parent=self.parent, fieldPath=self.field_path)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "PostKeyClass") -> "PostUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "SchemaFieldKeyClass") -> "SchemaFieldUrn":
+        return cls(parent=key_aspect.parent, field_path=key_aspect.fieldPath)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def parent(self) -> str:
+        return self._entity_ids[0]
+
+    @property
+    def field_path(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import GlossaryTermKeyClass
+    from datahub.metadata.schema_classes import TagKeyClass
 
-class GlossaryTermUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "glossaryTerm"
+class TagUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["tag"]] = "tag"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, name: Union["GlossaryTermUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, name: Union["TagUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(name, str):
                 if name.startswith('urn:li:'):
                     try:
-                        name = GlossaryTermUrn.from_string(name)
+                        name = TagUrn.from_string(name)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a GlossaryTermUrn but got {name}')
+                        raise InvalidUrnError(f'Expecting a TagUrn but got {name}')
                 else:
                     name = UrnEncoder.encode_string(name)
 
         # Validation logic.
         if not name:
-            raise InvalidUrnError("GlossaryTermUrn name cannot be empty")
-        if isinstance(name, GlossaryTermUrn):
+            raise InvalidUrnError("TagUrn name cannot be empty")
+        if isinstance(name, TagUrn):
             name = name.name
         elif isinstance(name, Urn):
-            raise InvalidUrnError(f'Expecting a GlossaryTermUrn but got {name}')
+            raise InvalidUrnError(f'Expecting a TagUrn but got {name}')
         if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'GlossaryTermUrn name contains reserved characters')
+            raise InvalidUrnError(f'TagUrn name contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [name])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "GlossaryTermUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "TagUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"GlossaryTermUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"TagUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(name=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["GlossaryTermKeyClass"]:
-        from datahub.metadata.schema_classes import GlossaryTermKeyClass
+    def underlying_key_aspect_type(cls) -> Type["TagKeyClass"]:
+        from datahub.metadata.schema_classes import TagKeyClass
 
-        return GlossaryTermKeyClass
+        return TagKeyClass
 
-    def to_key_aspect(self) -> "GlossaryTermKeyClass":
-        from datahub.metadata.schema_classes import GlossaryTermKeyClass
+    def to_key_aspect(self) -> "TagKeyClass":
+        from datahub.metadata.schema_classes import TagKeyClass
 
-        return GlossaryTermKeyClass(name=self.name)
+        return TagKeyClass(name=self.name)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "GlossaryTermKeyClass") -> "GlossaryTermUrn":
+    def from_key_aspect(cls, key_aspect: "TagKeyClass") -> "TagUrn":
         return cls(name=key_aspect.name)
 
+    @classmethod
+    @deprecated(reason="Use the constructor instead")
+    def create_from_id(cls, id: str) -> "TagUrn":
+        return cls(id)
+
     @property
     def name(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import ERModelRelationshipKeyClass
+    from datahub.metadata.schema_classes import PostKeyClass
 
-class ErModelRelationshipUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "erModelRelationship"
+class PostUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["post"]] = "post"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["ErModelRelationshipUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["PostUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = ErModelRelationshipUrn.from_string(id)
+                        id = PostUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a ErModelRelationshipUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a PostUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("ErModelRelationshipUrn id cannot be empty")
-        if isinstance(id, ErModelRelationshipUrn):
+            raise InvalidUrnError("PostUrn id cannot be empty")
+        if isinstance(id, PostUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a ErModelRelationshipUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a PostUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'ErModelRelationshipUrn id contains reserved characters')
+            raise InvalidUrnError(f'PostUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "ErModelRelationshipUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "PostUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"ErModelRelationshipUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"PostUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["ERModelRelationshipKeyClass"]:
-        from datahub.metadata.schema_classes import ERModelRelationshipKeyClass
+    def underlying_key_aspect_type(cls) -> Type["PostKeyClass"]:
+        from datahub.metadata.schema_classes import PostKeyClass
 
-        return ERModelRelationshipKeyClass
+        return PostKeyClass
 
-    def to_key_aspect(self) -> "ERModelRelationshipKeyClass":
-        from datahub.metadata.schema_classes import ERModelRelationshipKeyClass
+    def to_key_aspect(self) -> "PostKeyClass":
+        from datahub.metadata.schema_classes import PostKeyClass
 
-        return ERModelRelationshipKeyClass(id=self.id)
+        return PostKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "ERModelRelationshipKeyClass") -> "ErModelRelationshipUrn":
+    def from_key_aspect(cls, key_aspect: "PostKeyClass") -> "PostUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import ExecutionRequestKeyClass
+    from datahub.metadata.schema_classes import DataHubIngestionSourceKeyClass
 
-class DataHubExecutionRequestUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubExecutionRequest"
+class DataHubIngestionSourceUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubIngestionSource"]] = "dataHubIngestionSource"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataHubExecutionRequestUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubIngestionSourceUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DataHubExecutionRequestUrn.from_string(id)
+                        id = DataHubIngestionSourceUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubExecutionRequestUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a DataHubIngestionSourceUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DataHubExecutionRequestUrn id cannot be empty")
-        if isinstance(id, DataHubExecutionRequestUrn):
+            raise InvalidUrnError("DataHubIngestionSourceUrn id cannot be empty")
+        if isinstance(id, DataHubIngestionSourceUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubExecutionRequestUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a DataHubIngestionSourceUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubExecutionRequestUrn id contains reserved characters')
+            raise InvalidUrnError(f'DataHubIngestionSourceUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubExecutionRequestUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubIngestionSourceUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubExecutionRequestUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"DataHubIngestionSourceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["ExecutionRequestKeyClass"]:
-        from datahub.metadata.schema_classes import ExecutionRequestKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubIngestionSourceKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubIngestionSourceKeyClass
 
-        return ExecutionRequestKeyClass
+        return DataHubIngestionSourceKeyClass
 
-    def to_key_aspect(self) -> "ExecutionRequestKeyClass":
-        from datahub.metadata.schema_classes import ExecutionRequestKeyClass
+    def to_key_aspect(self) -> "DataHubIngestionSourceKeyClass":
+        from datahub.metadata.schema_classes import DataHubIngestionSourceKeyClass
 
-        return ExecutionRequestKeyClass(id=self.id)
+        return DataHubIngestionSourceKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "ExecutionRequestKeyClass") -> "DataHubExecutionRequestUrn":
+    def from_key_aspect(cls, key_aspect: "DataHubIngestionSourceKeyClass") -> "DataHubIngestionSourceUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import QueryKeyClass
+    from datahub.metadata.schema_classes import InviteTokenKeyClass
 
-class QueryUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "query"
+class InviteTokenUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["inviteToken"]] = "inviteToken"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["QueryUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["InviteTokenUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = QueryUrn.from_string(id)
+                        id = InviteTokenUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a QueryUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a InviteTokenUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("QueryUrn id cannot be empty")
-        if isinstance(id, QueryUrn):
+            raise InvalidUrnError("InviteTokenUrn id cannot be empty")
+        if isinstance(id, InviteTokenUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a QueryUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a InviteTokenUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'QueryUrn id contains reserved characters')
+            raise InvalidUrnError(f'InviteTokenUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "QueryUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "InviteTokenUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"QueryUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"InviteTokenUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["QueryKeyClass"]:
-        from datahub.metadata.schema_classes import QueryKeyClass
+    def underlying_key_aspect_type(cls) -> Type["InviteTokenKeyClass"]:
+        from datahub.metadata.schema_classes import InviteTokenKeyClass
 
-        return QueryKeyClass
+        return InviteTokenKeyClass
 
-    def to_key_aspect(self) -> "QueryKeyClass":
-        from datahub.metadata.schema_classes import QueryKeyClass
+    def to_key_aspect(self) -> "InviteTokenKeyClass":
+        from datahub.metadata.schema_classes import InviteTokenKeyClass
 
-        return QueryKeyClass(id=self.id)
+        return InviteTokenKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "QueryKeyClass") -> "QueryUrn":
+    def from_key_aspect(cls, key_aspect: "InviteTokenKeyClass") -> "InviteTokenUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
     from datahub.metadata.schema_classes import DataHubPersonaKeyClass
 
 class DataHubPersonaUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubPersona"
+    ENTITY_TYPE: ClassVar[Literal["dataHubPersona"]] = "dataHubPersona"
     _URN_PARTS: ClassVar[int] = 1
 
     def __init__(self, id: Union["DataHubPersonaUrn", str], *, _allow_coercion: bool = True) -> None:
@@ -2832,527 +2877,506 @@ class DataHubPersonaUrn(_SpecificUrn):
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import ChartKeyClass
+    from datahub.metadata.schema_classes import ContainerKeyClass
 
-class ChartUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "chart"
-    _URN_PARTS: ClassVar[int] = 2
+class ContainerUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["container"]] = "container"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, dashboard_tool: str, chart_id: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, guid: Union["ContainerUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            dashboard_tool = UrnEncoder.encode_string(dashboard_tool)
-            chart_id = UrnEncoder.encode_string(chart_id)
+            if isinstance(guid, str):
+                if guid.startswith('urn:li:'):
+                    try:
+                        guid = ContainerUrn.from_string(guid)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a ContainerUrn but got {guid}')
+                else:
+                    guid = UrnEncoder.encode_string(guid)
 
         # Validation logic.
-        if not dashboard_tool:
-            raise InvalidUrnError("ChartUrn dashboard_tool cannot be empty")
-        if UrnEncoder.contains_reserved_char(dashboard_tool):
-            raise InvalidUrnError(f'ChartUrn dashboard_tool contains reserved characters')
-        if not chart_id:
-            raise InvalidUrnError("ChartUrn chart_id cannot be empty")
-        if UrnEncoder.contains_reserved_char(chart_id):
-            raise InvalidUrnError(f'ChartUrn chart_id contains reserved characters')
+        if not guid:
+            raise InvalidUrnError("ContainerUrn guid cannot be empty")
+        if isinstance(guid, ContainerUrn):
+            guid = guid.guid
+        elif isinstance(guid, Urn):
+            raise InvalidUrnError(f'Expecting a ContainerUrn but got {guid}')
+        if UrnEncoder.contains_reserved_char(guid):
+            raise InvalidUrnError(f'ContainerUrn guid contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [dashboard_tool, chart_id])
+        super().__init__(self.ENTITY_TYPE, [guid])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "ChartUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "ContainerUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"ChartUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(dashboard_tool=entity_ids[0], chart_id=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"ContainerUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(guid=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["ChartKeyClass"]:
-        from datahub.metadata.schema_classes import ChartKeyClass
+    def underlying_key_aspect_type(cls) -> Type["ContainerKeyClass"]:
+        from datahub.metadata.schema_classes import ContainerKeyClass
 
-        return ChartKeyClass
+        return ContainerKeyClass
 
-    def to_key_aspect(self) -> "ChartKeyClass":
-        from datahub.metadata.schema_classes import ChartKeyClass
+    def to_key_aspect(self) -> "ContainerKeyClass":
+        from datahub.metadata.schema_classes import ContainerKeyClass
 
-        return ChartKeyClass(dashboardTool=self.dashboard_tool, chartId=self.chart_id)
+        return ContainerKeyClass(guid=self.guid)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "ChartKeyClass") -> "ChartUrn":
-        return cls(dashboard_tool=key_aspect.dashboardTool, chart_id=key_aspect.chartId)
-
-    @property
-    def dashboard_tool(self) -> str:
-        return self.entity_ids[0]
+    def from_key_aspect(cls, key_aspect: "ContainerKeyClass") -> "ContainerUrn":
+        return cls(guid=key_aspect.guid)
 
     @property
-    def chart_id(self) -> str:
-        return self.entity_ids[1]
+    def guid(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import VersionSetKeyClass
+    from datahub.metadata.schema_classes import IncidentKeyClass
 
-class VersionSetUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "versionSet"
-    _URN_PARTS: ClassVar[int] = 2
+class IncidentUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["incident"]] = "incident"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: str, entity_type: str, *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["IncidentUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            id = UrnEncoder.encode_string(id)
-            entity_type = UrnEncoder.encode_string(entity_type)
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = IncidentUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a IncidentUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("VersionSetUrn id cannot be empty")
+            raise InvalidUrnError("IncidentUrn id cannot be empty")
+        if isinstance(id, IncidentUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a IncidentUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'VersionSetUrn id contains reserved characters')
-        if not entity_type:
-            raise InvalidUrnError("VersionSetUrn entity_type cannot be empty")
-        if UrnEncoder.contains_reserved_char(entity_type):
-            raise InvalidUrnError(f'VersionSetUrn entity_type contains reserved characters')
+            raise InvalidUrnError(f'IncidentUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id, entity_type])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "VersionSetUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "IncidentUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"VersionSetUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], entity_type=entity_ids[1], _allow_coercion=False)
+            raise InvalidUrnError(f"IncidentUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["VersionSetKeyClass"]:
-        from datahub.metadata.schema_classes import VersionSetKeyClass
+    def underlying_key_aspect_type(cls) -> Type["IncidentKeyClass"]:
+        from datahub.metadata.schema_classes import IncidentKeyClass
 
-        return VersionSetKeyClass
+        return IncidentKeyClass
 
-    def to_key_aspect(self) -> "VersionSetKeyClass":
-        from datahub.metadata.schema_classes import VersionSetKeyClass
+    def to_key_aspect(self) -> "IncidentKeyClass":
+        from datahub.metadata.schema_classes import IncidentKeyClass
 
-        return VersionSetKeyClass(id=self.id, entityType=self.entity_type)
+        return IncidentKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "VersionSetKeyClass") -> "VersionSetUrn":
-        return cls(id=key_aspect.id, entity_type=key_aspect.entityType)
+    def from_key_aspect(cls, key_aspect: "IncidentKeyClass") -> "IncidentUrn":
+        return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
-
-    @property
-    def entity_type(self) -> str:
-        return self.entity_ids[1]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubAccessTokenKeyClass
+    from datahub.metadata.schema_classes import DataPlatformInstanceKeyClass
 
-class DataHubAccessTokenUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubAccessToken"
-    _URN_PARTS: ClassVar[int] = 1
+class DataPlatformInstanceUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataPlatformInstance"]] = "dataPlatformInstance"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, id: Union["DataHubAccessTokenUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, platform: Union["DataPlatformUrn", str], instance: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(id, str):
-                if id.startswith('urn:li:'):
-                    try:
-                        id = DataHubAccessTokenUrn.from_string(id)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubAccessTokenUrn but got {id}')
-                else:
-                    id = UrnEncoder.encode_string(id)
+            platform = DataPlatformUrn(platform).urn()
+            instance = UrnEncoder.encode_string(instance)
 
         # Validation logic.
-        if not id:
-            raise InvalidUrnError("DataHubAccessTokenUrn id cannot be empty")
-        if isinstance(id, DataHubAccessTokenUrn):
-            id = id.id
-        elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubAccessTokenUrn but got {id}')
-        if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubAccessTokenUrn id contains reserved characters')
+        if not platform:
+            raise InvalidUrnError("DataPlatformInstanceUrn platform cannot be empty")
+        platform = str(platform)  # convert urn type to str
+        assert DataPlatformUrn.from_string(platform)
+        if not instance:
+            raise InvalidUrnError("DataPlatformInstanceUrn instance cannot be empty")
+        if UrnEncoder.contains_reserved_char(instance):
+            raise InvalidUrnError(f'DataPlatformInstanceUrn instance contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [id])
+        super().__init__(self.ENTITY_TYPE, [platform, instance])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubAccessTokenUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataPlatformInstanceUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubAccessTokenUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(id=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"DataPlatformInstanceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(platform=entity_ids[0], instance=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubAccessTokenKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubAccessTokenKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataPlatformInstanceKeyClass"]:
+        from datahub.metadata.schema_classes import DataPlatformInstanceKeyClass
 
-        return DataHubAccessTokenKeyClass
+        return DataPlatformInstanceKeyClass
 
-    def to_key_aspect(self) -> "DataHubAccessTokenKeyClass":
-        from datahub.metadata.schema_classes import DataHubAccessTokenKeyClass
+    def to_key_aspect(self) -> "DataPlatformInstanceKeyClass":
+        from datahub.metadata.schema_classes import DataPlatformInstanceKeyClass
 
-        return DataHubAccessTokenKeyClass(id=self.id)
+        return DataPlatformInstanceKeyClass(platform=self.platform, instance=self.instance)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubAccessTokenKeyClass") -> "DataHubAccessTokenUrn":
-        return cls(id=key_aspect.id)
+    def from_key_aspect(cls, key_aspect: "DataPlatformInstanceKeyClass") -> "DataPlatformInstanceUrn":
+        return cls(platform=key_aspect.platform, instance=key_aspect.instance)
 
     @property
-    def id(self) -> str:
-        return self.entity_ids[0]
+    def platform(self) -> str:
+        return self._entity_ids[0]
+
+    @property
+    def instance(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataProcessInstanceKeyClass
+    from datahub.metadata.schema_classes import TestKeyClass
 
-class DataProcessInstanceUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataProcessInstance"
+class TestUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["test"]] = "test"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataProcessInstanceUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["TestUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DataProcessInstanceUrn.from_string(id)
+                        id = TestUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataProcessInstanceUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a TestUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DataProcessInstanceUrn id cannot be empty")
-        if isinstance(id, DataProcessInstanceUrn):
+            raise InvalidUrnError("TestUrn id cannot be empty")
+        if isinstance(id, TestUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataProcessInstanceUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a TestUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataProcessInstanceUrn id contains reserved characters')
+            raise InvalidUrnError(f'TestUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataProcessInstanceUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "TestUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataProcessInstanceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"TestUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataProcessInstanceKeyClass"]:
-        from datahub.metadata.schema_classes import DataProcessInstanceKeyClass
+    def underlying_key_aspect_type(cls) -> Type["TestKeyClass"]:
+        from datahub.metadata.schema_classes import TestKeyClass
 
-        return DataProcessInstanceKeyClass
+        return TestKeyClass
 
-    def to_key_aspect(self) -> "DataProcessInstanceKeyClass":
-        from datahub.metadata.schema_classes import DataProcessInstanceKeyClass
+    def to_key_aspect(self) -> "TestKeyClass":
+        from datahub.metadata.schema_classes import TestKeyClass
 
-        return DataProcessInstanceKeyClass(id=self.id)
+        return TestKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataProcessInstanceKeyClass") -> "DataProcessInstanceUrn":
+    def from_key_aspect(cls, key_aspect: "TestKeyClass") -> "TestUrn":
         return cls(id=key_aspect.id)
 
-    @classmethod
-    @deprecated(reason="Use the constructor instead")
-    def create_from_id(cls, id: str) -> "DataProcessInstanceUrn":
-        return cls(id)
-
-    @deprecated(reason="Use .id instead")
-    def get_dataprocessinstance_id(self) -> str:
-        return self.id
-
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import CorpGroupKeyClass
+    from datahub.metadata.schema_classes import VersionSetKeyClass
 
-class CorpGroupUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "corpGroup"
-    _URN_PARTS: ClassVar[int] = 1
+class VersionSetUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["versionSet"]] = "versionSet"
+    _URN_PARTS: ClassVar[int] = 2
 
-    def __init__(self, name: Union["CorpGroupUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: str, entity_type: str, *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            if isinstance(name, str):
-                if name.startswith('urn:li:'):
-                    try:
-                        name = CorpGroupUrn.from_string(name)
-                    except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a CorpGroupUrn but got {name}')
-                else:
-                    name = UrnEncoder.encode_string(name)
+            id = UrnEncoder.encode_string(id)
+            entity_type = UrnEncoder.encode_string(entity_type)
 
         # Validation logic.
-        if not name:
-            raise InvalidUrnError("CorpGroupUrn name cannot be empty")
-        if isinstance(name, CorpGroupUrn):
-            name = name.name
-        elif isinstance(name, Urn):
-            raise InvalidUrnError(f'Expecting a CorpGroupUrn but got {name}')
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'CorpGroupUrn name contains reserved characters')
+        if not id:
+            raise InvalidUrnError("VersionSetUrn id cannot be empty")
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'VersionSetUrn id contains reserved characters')
+        if not entity_type:
+            raise InvalidUrnError("VersionSetUrn entity_type cannot be empty")
+        if UrnEncoder.contains_reserved_char(entity_type):
+            raise InvalidUrnError(f'VersionSetUrn entity_type contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [name])
+        super().__init__(self.ENTITY_TYPE, [id, entity_type])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "CorpGroupUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "VersionSetUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"CorpGroupUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(name=entity_ids[0], _allow_coercion=False)
+            raise InvalidUrnError(f"VersionSetUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], entity_type=entity_ids[1], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["CorpGroupKeyClass"]:
-        from datahub.metadata.schema_classes import CorpGroupKeyClass
+    def underlying_key_aspect_type(cls) -> Type["VersionSetKeyClass"]:
+        from datahub.metadata.schema_classes import VersionSetKeyClass
 
-        return CorpGroupKeyClass
+        return VersionSetKeyClass
 
-    def to_key_aspect(self) -> "CorpGroupKeyClass":
-        from datahub.metadata.schema_classes import CorpGroupKeyClass
+    def to_key_aspect(self) -> "VersionSetKeyClass":
+        from datahub.metadata.schema_classes import VersionSetKeyClass
 
-        return CorpGroupKeyClass(name=self.name)
+        return VersionSetKeyClass(id=self.id, entityType=self.entity_type)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "CorpGroupKeyClass") -> "CorpGroupUrn":
-        return cls(name=key_aspect.name)
+    def from_key_aspect(cls, key_aspect: "VersionSetKeyClass") -> "VersionSetUrn":
+        return cls(id=key_aspect.id, entity_type=key_aspect.entityType)
 
-    @classmethod
-    @deprecated(reason="Use the constructor instead")
-    def create_from_id(cls, id: str) -> "CorpGroupUrn":
-        return cls(id)
+    @property
+    def id(self) -> str:
+        return self._entity_ids[0]
 
     @property
-    def name(self) -> str:
-        return self.entity_ids[0]
+    def entity_type(self) -> str:
+        return self._entity_ids[1]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataProcessKeyClass
+    from datahub.metadata.schema_classes import DataHubSecretKeyClass
 
-class DataProcessUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataProcess"
-    _URN_PARTS: ClassVar[int] = 3
+class DataHubSecretUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["dataHubSecret"]] = "dataHubSecret"
+    _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, name: str, orchestrator: str, env: str = "PROD", *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["DataHubSecretUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
-            name = UrnEncoder.encode_string(name)
-            orchestrator = UrnEncoder.encode_string(orchestrator)
-            env = env.upper()
+            if isinstance(id, str):
+                if id.startswith('urn:li:'):
+                    try:
+                        id = DataHubSecretUrn.from_string(id)
+                    except InvalidUrnError:
+                        raise InvalidUrnError(f'Expecting a DataHubSecretUrn but got {id}')
+                else:
+                    id = UrnEncoder.encode_string(id)
 
         # Validation logic.
-        if not name:
-            raise InvalidUrnError("DataProcessUrn name cannot be empty")
-        if UrnEncoder.contains_reserved_char(name):
-            raise InvalidUrnError(f'DataProcessUrn name contains reserved characters')
-        if not orchestrator:
-            raise InvalidUrnError("DataProcessUrn orchestrator cannot be empty")
-        if UrnEncoder.contains_reserved_char(orchestrator):
-            raise InvalidUrnError(f'DataProcessUrn orchestrator contains reserved characters')
-        if not env:
-            raise InvalidUrnError("DataProcessUrn env cannot be empty")
-        if UrnEncoder.contains_reserved_char(env):
-            raise InvalidUrnError(f'DataProcessUrn env contains reserved characters')
+        if not id:
+            raise InvalidUrnError("DataHubSecretUrn id cannot be empty")
+        if isinstance(id, DataHubSecretUrn):
+            id = id.id
+        elif isinstance(id, Urn):
+            raise InvalidUrnError(f'Expecting a DataHubSecretUrn but got {id}')
+        if UrnEncoder.contains_reserved_char(id):
+            raise InvalidUrnError(f'DataHubSecretUrn id contains reserved characters')
 
-        super().__init__(self.ENTITY_TYPE, [name, orchestrator, env])
+        super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataProcessUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubSecretUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataProcessUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
-        return cls(name=entity_ids[0], orchestrator=entity_ids[1], env=entity_ids[2], _allow_coercion=False)
+            raise InvalidUrnError(f"DataHubSecretUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+        return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataProcessKeyClass"]:
-        from datahub.metadata.schema_classes import DataProcessKeyClass
+    def underlying_key_aspect_type(cls) -> Type["DataHubSecretKeyClass"]:
+        from datahub.metadata.schema_classes import DataHubSecretKeyClass
 
-        return DataProcessKeyClass
+        return DataHubSecretKeyClass
 
-    def to_key_aspect(self) -> "DataProcessKeyClass":
-        from datahub.metadata.schema_classes import DataProcessKeyClass
+    def to_key_aspect(self) -> "DataHubSecretKeyClass":
+        from datahub.metadata.schema_classes import DataHubSecretKeyClass
 
-        return DataProcessKeyClass(name=self.name, orchestrator=self.orchestrator, origin=self.env)
+        return DataHubSecretKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataProcessKeyClass") -> "DataProcessUrn":
-        return cls(name=key_aspect.name, orchestrator=key_aspect.orchestrator, env=key_aspect.origin)
-
-    @property
-    def name(self) -> str:
-        return self.entity_ids[0]
-
-    @property
-    def orchestrator(self) -> str:
-        return self.entity_ids[1]
+    def from_key_aspect(cls, key_aspect: "DataHubSecretKeyClass") -> "DataHubSecretUrn":
+        return cls(id=key_aspect.id)
 
     @property
-    def env(self) -> str:
-        return self.entity_ids[2]
+    def id(self) -> str:
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import DataHubIngestionSourceKeyClass
+    from datahub.metadata.schema_classes import EntityTypeKeyClass
 
-class DataHubIngestionSourceUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "dataHubIngestionSource"
+class EntityTypeUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["entityType"]] = "entityType"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["DataHubIngestionSourceUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["EntityTypeUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = DataHubIngestionSourceUrn.from_string(id)
+                        id = EntityTypeUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a DataHubIngestionSourceUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a EntityTypeUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("DataHubIngestionSourceUrn id cannot be empty")
-        if isinstance(id, DataHubIngestionSourceUrn):
+            raise InvalidUrnError("EntityTypeUrn id cannot be empty")
+        if isinstance(id, EntityTypeUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a DataHubIngestionSourceUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a EntityTypeUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'DataHubIngestionSourceUrn id contains reserved characters')
+            raise InvalidUrnError(f'EntityTypeUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "DataHubIngestionSourceUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "EntityTypeUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"DataHubIngestionSourceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"EntityTypeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["DataHubIngestionSourceKeyClass"]:
-        from datahub.metadata.schema_classes import DataHubIngestionSourceKeyClass
+    def underlying_key_aspect_type(cls) -> Type["EntityTypeKeyClass"]:
+        from datahub.metadata.schema_classes import EntityTypeKeyClass
 
-        return DataHubIngestionSourceKeyClass
+        return EntityTypeKeyClass
 
-    def to_key_aspect(self) -> "DataHubIngestionSourceKeyClass":
-        from datahub.metadata.schema_classes import DataHubIngestionSourceKeyClass
+    def to_key_aspect(self) -> "EntityTypeKeyClass":
+        from datahub.metadata.schema_classes import EntityTypeKeyClass
 
-        return DataHubIngestionSourceKeyClass(id=self.id)
+        return EntityTypeKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "DataHubIngestionSourceKeyClass") -> "DataHubIngestionSourceUrn":
+    def from_key_aspect(cls, key_aspect: "EntityTypeKeyClass") -> "EntityTypeUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import GlobalSettingsKeyClass
+    from datahub.metadata.schema_classes import StructuredPropertyKeyClass
 
-class GlobalSettingsUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "globalSettings"
+class StructuredPropertyUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["structuredProperty"]] = "structuredProperty"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["GlobalSettingsUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["StructuredPropertyUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = GlobalSettingsUrn.from_string(id)
+                        id = StructuredPropertyUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a GlobalSettingsUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a StructuredPropertyUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("GlobalSettingsUrn id cannot be empty")
-        if isinstance(id, GlobalSettingsUrn):
+            raise InvalidUrnError("StructuredPropertyUrn id cannot be empty")
+        if isinstance(id, StructuredPropertyUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a GlobalSettingsUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a StructuredPropertyUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'GlobalSettingsUrn id contains reserved characters')
+            raise InvalidUrnError(f'StructuredPropertyUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "GlobalSettingsUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "StructuredPropertyUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"GlobalSettingsUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"StructuredPropertyUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["GlobalSettingsKeyClass"]:
-        from datahub.metadata.schema_classes import GlobalSettingsKeyClass
+    def underlying_key_aspect_type(cls) -> Type["StructuredPropertyKeyClass"]:
+        from datahub.metadata.schema_classes import StructuredPropertyKeyClass
 
-        return GlobalSettingsKeyClass
+        return StructuredPropertyKeyClass
 
-    def to_key_aspect(self) -> "GlobalSettingsKeyClass":
-        from datahub.metadata.schema_classes import GlobalSettingsKeyClass
+    def to_key_aspect(self) -> "StructuredPropertyKeyClass":
+        from datahub.metadata.schema_classes import StructuredPropertyKeyClass
 
-        return GlobalSettingsKeyClass(id=self.id)
+        return StructuredPropertyKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "GlobalSettingsKeyClass") -> "GlobalSettingsUrn":
+    def from_key_aspect(cls, key_aspect: "StructuredPropertyKeyClass") -> "StructuredPropertyUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 if TYPE_CHECKING:
-    from datahub.metadata.schema_classes import EntityTypeKeyClass
+    from datahub.metadata.schema_classes import PlatformResourceKeyClass
 
-class EntityTypeUrn(_SpecificUrn):
-    ENTITY_TYPE: ClassVar[str] = "entityType"
+class PlatformResourceUrn(_SpecificUrn):
+    ENTITY_TYPE: ClassVar[Literal["platformResource"]] = "platformResource"
     _URN_PARTS: ClassVar[int] = 1
 
-    def __init__(self, id: Union["EntityTypeUrn", str], *, _allow_coercion: bool = True) -> None:
+    def __init__(self, id: Union["PlatformResourceUrn", str], *, _allow_coercion: bool = True) -> None:
         if _allow_coercion:
             # Field coercion logic (if any is required).
             if isinstance(id, str):
                 if id.startswith('urn:li:'):
                     try:
-                        id = EntityTypeUrn.from_string(id)
+                        id = PlatformResourceUrn.from_string(id)
                     except InvalidUrnError:
-                        raise InvalidUrnError(f'Expecting a EntityTypeUrn but got {id}')
+                        raise InvalidUrnError(f'Expecting a PlatformResourceUrn but got {id}')
                 else:
                     id = UrnEncoder.encode_string(id)
 
         # Validation logic.
         if not id:
-            raise InvalidUrnError("EntityTypeUrn id cannot be empty")
-        if isinstance(id, EntityTypeUrn):
+            raise InvalidUrnError("PlatformResourceUrn id cannot be empty")
+        if isinstance(id, PlatformResourceUrn):
             id = id.id
         elif isinstance(id, Urn):
-            raise InvalidUrnError(f'Expecting a EntityTypeUrn but got {id}')
+            raise InvalidUrnError(f'Expecting a PlatformResourceUrn but got {id}')
         if UrnEncoder.contains_reserved_char(id):
-            raise InvalidUrnError(f'EntityTypeUrn id contains reserved characters')
+            raise InvalidUrnError(f'PlatformResourceUrn id contains reserved characters')
 
         super().__init__(self.ENTITY_TYPE, [id])
 
     @classmethod
-    def _parse_ids(cls, entity_ids: List[str]) -> "EntityTypeUrn":
+    def _parse_ids(cls, entity_ids: List[str]) -> "PlatformResourceUrn":
         if len(entity_ids) != cls._URN_PARTS:
-            raise InvalidUrnError(f"EntityTypeUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
+            raise InvalidUrnError(f"PlatformResourceUrn should have {cls._URN_PARTS} parts, got {len(entity_ids)}: {entity_ids}")
         return cls(id=entity_ids[0], _allow_coercion=False)
 
     @classmethod
-    def underlying_key_aspect_type(cls) -> Type["EntityTypeKeyClass"]:
-        from datahub.metadata.schema_classes import EntityTypeKeyClass
+    def underlying_key_aspect_type(cls) -> Type["PlatformResourceKeyClass"]:
+        from datahub.metadata.schema_classes import PlatformResourceKeyClass
 
-        return EntityTypeKeyClass
+        return PlatformResourceKeyClass
 
-    def to_key_aspect(self) -> "EntityTypeKeyClass":
-        from datahub.metadata.schema_classes import EntityTypeKeyClass
+    def to_key_aspect(self) -> "PlatformResourceKeyClass":
+        from datahub.metadata.schema_classes import PlatformResourceKeyClass
 
-        return EntityTypeKeyClass(id=self.id)
+        return PlatformResourceKeyClass(id=self.id)
 
     @classmethod
-    def from_key_aspect(cls, key_aspect: "EntityTypeKeyClass") -> "EntityTypeUrn":
+    def from_key_aspect(cls, key_aspect: "PlatformResourceKeyClass") -> "PlatformResourceUrn":
         return cls(id=key_aspect.id)
 
     @property
     def id(self) -> str:
-        return self.entity_ids[0]
+        return self._entity_ids[0]
 
 # fmt: on