diff --git a/README.md b/README.md
index 4e29185..16a5c4c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Database schema management, for CodeIgniter 4
 
 ## Quick Start
 
-1. Install with Composer: `> composer require tatter/schemas`
+1. Install with Composer: `> composer require mkuettel/codeigniter4-schemas`
 2. Generate a new schema: `> php spark schemas`
 
 ## Features
diff --git a/composer.json b/composer.json
index 3a9267d..e9b259c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "tatter/schemas",
+    "name": "mkuettel/codeigniter4-schemas",
     "description": "Database schema management, for CodeIgniter 4",
     "license": "MIT",
     "type": "library",
@@ -17,9 +17,14 @@
             "email": "mgatner@tattersoftware.com",
             "homepage": "https://tattersoftware.com",
             "role": "Developer"
+        },
+        {
+            "name": "Moritz Küttel",
+            "email": "moritz_kuettel+composer_ci4schemas@tattersoftware.com",
+            "role": "Developer"
         }
     ],
-    "homepage": "https://github.com/tattersoftware/codeigniter4-schemas",
+    "homepage": "https://github.com/mkuettel/codeigniter4-schemas",
     "require": {
         "php": "^7.4 || ^8.0"
     },
diff --git a/src/Config/Schemas.php b/src/Config/Schemas.php
index 135ace8..81f8f23 100644
--- a/src/Config/Schemas.php
+++ b/src/Config/Schemas.php
@@ -33,7 +33,6 @@ class Schemas extends BaseConfig
 
     // Namespaces to ignore (mostly for ModelHandler)
     public $ignoredNamespaces = [
-        'Tests\Support',
         'CodeIgniter\Commands\Generators',
     ];
 
diff --git a/src/Drafter/Handlers/ModelHandler.php b/src/Drafter/Handlers/ModelHandler.php
index d31ef31..704d9a0 100644
--- a/src/Drafter/Handlers/ModelHandler.php
+++ b/src/Drafter/Handlers/ModelHandler.php
@@ -168,6 +168,10 @@ protected function getModels(): array
                 continue;
             }
 
+            if (!(new \ReflectionClass($class))->isInstantiable()) {
+                continue;
+            }
+
             // Try to instantiate
             try {
                 $instance = new $class();