diff --git a/packages/overture-schema-base-theme/pyproject.toml b/packages/overture-schema-base-theme/pyproject.toml
index d71b20f82..0598aac9f 100644
--- a/packages/overture-schema-base-theme/pyproject.toml
+++ b/packages/overture-schema-base-theme/pyproject.toml
@@ -1,6 +1,7 @@
 [project]
 dependencies = [
     "overture-schema-core",
+    "overture-schema-system",
     "pydantic>=2.0",
 ]
 description = "Overture Maps base theme shared structures and models (bathymetry, infrastructure, land, land_cover, land_use, water)"
@@ -12,6 +13,7 @@ requires-python = ">=3.10"
 
 [tool.uv.sources]
 overture-schema-core = { workspace = true }
+overture-schema-system = { workspace = true }
 
 
 [build-system]
diff --git a/packages/overture-schema-buildings-theme/pyproject.toml b/packages/overture-schema-buildings-theme/pyproject.toml
index e9766fc61..d5908b41c 100644
--- a/packages/overture-schema-buildings-theme/pyproject.toml
+++ b/packages/overture-schema-buildings-theme/pyproject.toml
@@ -1,6 +1,7 @@
 [project]
 dependencies = [
     "overture-schema-core",
+    "overture-schema-system",
     "pydantic>=2.0",
 ]
 description = "Overture Maps buildings theme shared structures, building types, and building part types"
@@ -12,6 +13,7 @@ requires-python = ">=3.10"
 
 [tool.uv.sources]
 overture-schema-core = { workspace = true }
+overture-schema-system = { workspace = true }
 
 
 [build-system]
diff --git a/packages/overture-schema-cli/pyproject.toml b/packages/overture-schema-cli/pyproject.toml
index 62ed4c3e3..e5ea000e7 100644
--- a/packages/overture-schema-cli/pyproject.toml
+++ b/packages/overture-schema-cli/pyproject.toml
@@ -1,6 +1,7 @@
 [project]
 dependencies = [
     "overture-schema-core",
+    "overture-schema-system",
     "pydantic>=2.0",
     "pyyaml>=6.0.2",
     "click>=8.0",
@@ -16,6 +17,7 @@ requires-python = ">=3.10"
 
 [tool.uv.sources]
 overture-schema-core = { workspace = true }
+overture-schema-system = { workspace = true }
 
 [build-system]
 build-backend = "hatchling.build"
diff --git a/packages/overture-schema-core/pyproject.toml b/packages/overture-schema-core/pyproject.toml
index f7639dd34..4465c5c99 100644
--- a/packages/overture-schema-core/pyproject.toml
+++ b/packages/overture-schema-core/pyproject.toml
@@ -8,10 +8,14 @@ dynamic = ["version"]
 description = "Core schemas for Overture Maps"
 license = "MIT"
 dependencies = [
+    "overture-schema-system",
     "pydantic>=2.0",
     "shapely>=2.1.1",
 ]
 
+[tool.uv.sources]
+overture-schema-system = { workspace = true }
+
 [tool.hatch.version]
 path = "src/overture/schema/core/__about__.py"
 
diff --git a/packages/overture-schema-transportation-theme/pyproject.toml b/packages/overture-schema-transportation-theme/pyproject.toml
index 2be7ed8ea..344c1a6f9 100644
--- a/packages/overture-schema-transportation-theme/pyproject.toml
+++ b/packages/overture-schema-transportation-theme/pyproject.toml
@@ -1,6 +1,7 @@
 [project]
 dependencies = [
     "overture-schema-core",
+    "overture-schema-system",
     "pydantic>=2.0",
 ]
 description = "Overture Maps transportation theme with shared structures and connector and segment types"
@@ -12,6 +13,7 @@ requires-python = ">=3.10"
 
 [tool.uv.sources]
 overture-schema-core = { workspace = true }
+overture-schema-system = { workspace = true }
 
 
 [build-system]
diff --git a/uv.lock b/uv.lock
index 8ee6263f7..a87e31ac1 100644
--- a/uv.lock
+++ b/uv.lock
@@ -648,12 +648,14 @@ name = "overture-schema-base-theme"
 source = { editable = "packages/overture-schema-base-theme" }
 dependencies = [
     { name = "overture-schema-core" },
+    { name = "overture-schema-system" },
     { name = "pydantic" },
 ]
 
 [package.metadata]
 requires-dist = [
     { name = "overture-schema-core", editable = "packages/overture-schema-core" },
+    { name = "overture-schema-system", editable = "packages/overture-schema-system" },
     { name = "pydantic", specifier = ">=2.0" },
 ]
 
@@ -662,12 +664,14 @@ name = "overture-schema-buildings-theme"
 source = { editable = "packages/overture-schema-buildings-theme" }
 dependencies = [
     { name = "overture-schema-core" },
+    { name = "overture-schema-system" },
     { name = "pydantic" },
 ]
 
 [package.metadata]
 requires-dist = [
     { name = "overture-schema-core", editable = "packages/overture-schema-core" },
+    { name = "overture-schema-system", editable = "packages/overture-schema-system" },
     { name = "pydantic", specifier = ">=2.0" },
 ]
 
@@ -677,6 +681,7 @@ source = { editable = "packages/overture-schema-cli" }
 dependencies = [
     { name = "click" },
     { name = "overture-schema-core" },
+    { name = "overture-schema-system" },
     { name = "pydantic" },
     { name = "pyyaml" },
     { name = "rich" },
@@ -694,6 +699,7 @@ dev = [
 requires-dist = [
     { name = "click", specifier = ">=8.0" },
     { name = "overture-schema-core", editable = "packages/overture-schema-core" },
+    { name = "overture-schema-system", editable = "packages/overture-schema-system" },
     { name = "pydantic", specifier = ">=2.0" },
     { name = "pyyaml", specifier = ">=6.0.2" },
     { name = "rich", specifier = ">=13.0" },
@@ -711,6 +717,7 @@ dev = [
 name = "overture-schema-core"
 source = { editable = "packages/overture-schema-core" }
 dependencies = [
+    { name = "overture-schema-system" },
     { name = "pydantic" },
     { name = "shapely" },
 ]
@@ -725,6 +732,7 @@ dev = [
 
 [package.metadata]
 requires-dist = [
+    { name = "overture-schema-system", editable = "packages/overture-schema-system" },
     { name = "pydantic", specifier = ">=2.0" },
     { name = "shapely", specifier = ">=2.1.1" },
 ]
@@ -803,12 +811,14 @@ name = "overture-schema-transportation-theme"
 source = { editable = "packages/overture-schema-transportation-theme" }
 dependencies = [
     { name = "overture-schema-core" },
+    { name = "overture-schema-system" },
     { name = "pydantic" },
 ]
 
 [package.metadata]
 requires-dist = [
     { name = "overture-schema-core", editable = "packages/overture-schema-core" },
+    { name = "overture-schema-system", editable = "packages/overture-schema-system" },
     { name = "pydantic", specifier = ">=2.0" },
 ]