diff --git a/packages/database/src/Command/DiffCommand.php b/packages/database/src/Command/DiffCommand.php
index fcbee57f..0996a3f9 100644
--- a/packages/database/src/Command/DiffCommand.php
+++ b/packages/database/src/Command/DiffCommand.php
@@ -13,10 +13,9 @@
 use Marko\Database\Diff\SchemaDiff;
 use Marko\Database\Diff\TableDiff;
 use Marko\Database\Entity\EntityDiscovery;
-use Marko\Database\Entity\EntityMetadataFactory;
-use Marko\Database\Entity\SchemaBuilder;
 use Marko\Database\Exceptions\EntityException;
 use Marko\Database\Introspection\IntrospectorInterface;
+use Marko\Database\Schema\SchemaRegistry;
 use Marko\Database\Schema\Table;
 
 /** @noinspection PhpUnused */
@@ -26,8 +25,7 @@
     public function __construct(
         private EntityDiscovery $discovery,
         private IntrospectorInterface $introspector,
-        private EntityMetadataFactory $metadataFactory,
-        private SchemaBuilder $schemaBuilder,
+        private SchemaRegistry $schemaRegistry,
         private DiffCalculator $diffCalculator,
         private ProjectPaths $paths,
     ) {}
@@ -77,15 +75,10 @@ public function execute(
     private function buildEntitySchema(
         array $entityClasses,
     ): array {
-        $schema = [];
-
-        foreach ($entityClasses as $entityClass) {
-            $metadata = $this->metadataFactory->parse($entityClass);
-            $table = $this->schemaBuilder->build($metadata);
-            $schema[$table->name] = $table;
-        }
+        $this->schemaRegistry->clear();
+        $this->schemaRegistry->registerEntities($entityClasses);
 
-        return $schema;
+        return $this->schemaRegistry->getTables();
     }
 
     /**
diff --git a/packages/database/src/Command/MigrateCommand.php b/packages/database/src/Command/MigrateCommand.php
index d5bad656..0e47e678 100644
--- a/packages/database/src/Command/MigrateCommand.php
+++ b/packages/database/src/Command/MigrateCommand.php
@@ -13,14 +13,13 @@
 use Marko\Database\Diff\SchemaDiff;
 use Marko\Database\Diff\SqlGeneratorInterface;
 use Marko\Database\Entity\EntityDiscovery;
-use Marko\Database\Entity\EntityMetadataFactory;
-use Marko\Database\Entity\SchemaBuilder;
 use Marko\Database\Exceptions\EntityException;
 use Marko\Database\Exceptions\MigrationException;
 use Marko\Database\Introspection\IntrospectorInterface;
 use Marko\Database\Migration\DataMigrator;
 use Marko\Database\Migration\MigrationGenerator;
 use Marko\Database\Migration\Migrator;
+use Marko\Database\Schema\SchemaRegistry;
 use Marko\Database\Schema\Table;
 
 /** @noinspection PhpUnused */
@@ -33,8 +32,7 @@ public function __construct(
         private MigrationGenerator $migrationGenerator,
         private EntityDiscovery $entityDiscovery,
         private IntrospectorInterface $introspector,
-        private EntityMetadataFactory $metadataFactory,
-        private SchemaBuilder $schemaBuilder,
+        private SchemaRegistry $schemaRegistry,
         private DiffCalculator $diffCalculator,
         private SqlGeneratorInterface $sqlGenerator,
         private ProjectPaths $paths,
@@ -251,15 +249,10 @@ private function calculateDiff(): SchemaDiff
     private function buildEntitySchema(
         array $entityClasses,
     ): array {
-        $schema = [];
-
-        foreach ($entityClasses as $entityClass) {
-            $metadata = $this->metadataFactory->parse($entityClass);
-            $table = $this->schemaBuilder->build($metadata);
-            $schema[$table->name] = $table;
-        }
+        $this->schemaRegistry->clear();
+        $this->schemaRegistry->registerEntities($entityClasses);
 
-        return $schema;
+        return $this->schemaRegistry->getTables();
     }
 
     /**
diff --git a/packages/database/tests/Command/Helpers.php b/packages/database/tests/Command/Helpers.php
index 4e750fe0..5b6e9190 100644
--- a/packages/database/tests/Command/Helpers.php
+++ b/packages/database/tests/Command/Helpers.php
@@ -14,6 +14,7 @@
 use Marko\Database\Entity\EntityDiscovery;
 use Marko\Database\Entity\EntityMetadataFactory;
 use Marko\Database\Entity\SchemaBuilder;
+use Marko\Database\Schema\SchemaRegistry;
 use Marko\Database\Introspection\IntrospectorInterface;
 use Marko\Database\Schema\Table;
 
@@ -229,8 +230,7 @@ public static function createDiffCommand(
         return new DiffCommand(
             discovery: self::createStubEntityDiscovery(),
             introspector: self::createStubIntrospector($tables),
-            metadataFactory: new EntityMetadataFactory(),
-            schemaBuilder: new SchemaBuilder(),
+            schemaRegistry: new SchemaRegistry(new EntityMetadataFactory(), new SchemaBuilder()),
             diffCalculator: $diffCalculator ?? new DiffCalculator(),
             paths: new ProjectPaths('/test'),
         );
diff --git a/packages/database/tests/Command/MigrateCommandTest.php b/packages/database/tests/Command/MigrateCommandTest.php
index 34b9c4de..2847f127 100644
--- a/packages/database/tests/Command/MigrateCommandTest.php
+++ b/packages/database/tests/Command/MigrateCommandTest.php
@@ -12,6 +12,7 @@
 use Marko\Database\Diff\SqlGeneratorInterface;
 use Marko\Database\Entity\EntityMetadataFactory;
 use Marko\Database\Entity\SchemaBuilder;
+use Marko\Database\Schema\SchemaRegistry;
 use Marko\Database\Exceptions\MigrationException;
 use Marko\Database\Migration\DataMigrator;
 use Marko\Database\Migration\MigrationGenerator;
@@ -304,8 +305,7 @@ function createMigrateCommand(
         migrationGenerator: $generator ?? createMigrationGeneratorStub(),
         entityDiscovery: Helpers::createStubEntityDiscovery(),
         introspector: Helpers::createStubIntrospector(),
-        metadataFactory: new EntityMetadataFactory(),
-        schemaBuilder: new SchemaBuilder(),
+        schemaRegistry: new SchemaRegistry(new EntityMetadataFactory(), new SchemaBuilder()),
         diffCalculator: createMigrateDiffCalculator($diff ?? new SchemaDiff()),
         sqlGenerator: $sqlGenerator ?? createMigrateSqlGenerator(),
         paths: new ProjectPaths('/test'),
@@ -684,8 +684,7 @@ function executeMigrateCommand(
         migrationGenerator: $generator,
         entityDiscovery: Helpers::createStubEntityDiscovery(),
         introspector: $introspector,
-        metadataFactory: new EntityMetadataFactory(),
-        schemaBuilder: new SchemaBuilder(),
+        schemaRegistry: new SchemaRegistry(new EntityMetadataFactory(), new SchemaBuilder()),
         diffCalculator: new DiffCalculator(),
         sqlGenerator: createMigrateSqlGenerator(),
         paths: new ProjectPaths('/test'),