diff --git a/mitm_tooling/transformation/superset/definitions/mitm_dataset.py b/mitm_tooling/transformation/superset/definitions/mitm_dataset.py
index 5c5ff6197b4fe7f338a77d7b1537dac2eb3c1aa4..83d4d7ed395df33401bc32f6f79d7031f28f5fdf 100644
--- a/mitm_tooling/transformation/superset/definitions/mitm_dataset.py
+++ b/mitm_tooling/transformation/superset/definitions/mitm_dataset.py
@@ -10,19 +10,21 @@ class MitMDatasetIdentifier(BaseSupersetDefinition):
     uuid: StrUUID | None = None
 
 
-class RelatedTable(BaseSupersetDefinition):
-    table_id: SupersetId | None = None
-    table_uuid: StrUUID
+class RelatedObjectIdentifier(BaseSupersetDefinition):
+    id: SupersetId | None = None
+    uuid: StrUUID
+
+
+class RelatedTable(RelatedObjectIdentifier):
+    pass
 
 
-class RelatedSlice(BaseSupersetDefinition):
-    slice_id: SupersetId | None = None
-    slice_uuid: StrUUID
+class RelatedSlice(RelatedObjectIdentifier):
+    pass
 
 
-class RelatedDashboard(BaseSupersetDefinition):
-    dashboard_id: SupersetId | None = None
-    dashboard_uuid: StrUUID
+class RelatedDashboard(RelatedObjectIdentifier):
+    pass
 
 
 class SupersetMitMDatasetDef(SupersetDefFile):
diff --git a/mitm_tooling/transformation/superset/factories/mitm_dataset.py b/mitm_tooling/transformation/superset/factories/mitm_dataset.py
index fae7f79c4146d8a4e4097d31def212df78b0e8ff..2b15b05a1bf79de0ba6f41176b3e97fa9f071901 100644
--- a/mitm_tooling/transformation/superset/factories/mitm_dataset.py
+++ b/mitm_tooling/transformation/superset/factories/mitm_dataset.py
@@ -12,11 +12,11 @@ def mk_related_obj(kind: Literal['table', 'slice', 'dashboard'],
                    uuid: UUID) -> RelatedTable | RelatedSlice | RelatedDashboard | None:
     match kind:
         case 'table':
-            return RelatedTable(table_uuid=uuid)
+            return RelatedTable(uuid=uuid)
         case 'slice':
-            return RelatedSlice(slice_uuid=uuid)
+            return RelatedSlice(uuid=uuid)
         case 'dashboard':
-            return RelatedDashboard(dashboard_uuid=uuid)
+            return RelatedDashboard(uuid=uuid)
 
 
 def mk_related_objs(kind: Literal['table', 'slice', 'dashboard'], uuids: Iterable[UUID]) -> Iterable[RelatedTable] | \