diff --git a/example/config-app/uv.lock b/example/config-app/uv.lock
index f1a6cb64..4939697b 100644
--- a/example/config-app/uv.lock
+++ b/example/config-app/uv.lock
@@ -162,7 +162,7 @@ wheels = [
 
 [[package]]
 name = "fastapi-startkit"
-version = "0.26.0"
+version = "0.40.1"
 source = { editable = "../../fastapi_startkit" }
 dependencies = [
     { name = "cleo" },
@@ -178,23 +178,26 @@ dependencies = [
 requires-dist = [
     { name = "aiomysql", marker = "extra == 'mysql'", specifier = ">=0.2.0" },
     { name = "aiosqlite", marker = "extra == 'sqlite'", specifier = ">=0.22.1" },
+    { name = "anthropic", marker = "extra == 'ai'", specifier = ">=0.49.0" },
     { name = "asyncpg", marker = "extra == 'postgres'", specifier = ">=0.29.0" },
     { name = "cleo", specifier = ">=2.1.0,<3.0.0" },
     { name = "dotenv", specifier = ">=0.9.9" },
     { name = "dotty-dict", specifier = ">=1.3.1" },
     { name = "faker", marker = "extra == 'database'", specifier = ">=40.13.0" },
     { name = "fastapi", extras = ["standard"], marker = "extra == 'fastapi'", specifier = ">=0.124.4,<0.125.0" },
+    { name = "google-generativeai", marker = "extra == 'ai'", specifier = ">=0.8.0" },
     { name = "inflection", specifier = ">=0.5.1" },
     { name = "itsdangerous", marker = "extra == 'fastapi'", specifier = ">=2.2.0" },
     { name = "jinja2", marker = "extra == 'inertia'", specifier = ">=3.1" },
     { name = "jinja2", marker = "extra == 'vite'", specifier = ">=3.1" },
     { name = "markupsafe", marker = "extra == 'inertia'", specifier = ">=2.0" },
+    { name = "openai", marker = "extra == 'ai'", specifier = ">=1.0.0" },
     { name = "pendulum", specifier = ">=3.1.0,<4.0.0" },
     { name = "pydantic", specifier = ">=2.12.5" },
     { name = "requests", specifier = ">=2.32.5,<3.0.0" },
     { name = "sqlalchemy", extras = ["asyncio"], marker = "extra == 'database'", specifier = ">=2.0.38" },
 ]
-provides-extras = ["fastapi", "database", "sqlite", "postgres", "mysql", "vite", "inertia"]
+provides-extras = ["fastapi", "database", "sqlite", "postgres", "mysql", "vite", "inertia", "ai"]
 
 [package.metadata.requires-dev]
 dev = [
@@ -202,10 +205,12 @@ dev = [
     { name = "aiosqlite", specifier = ">=0.22.1" },
     { name = "asyncpg", specifier = ">=0.29.0" },
     { name = "dumpdie", specifier = ">=1.5.0" },
+    { name = "faker", specifier = ">=40.13.0" },
     { name = "fastapi", extras = ["standard"], specifier = ">=0.124.4" },
     { name = "itsdangerous", specifier = ">=2.2.0" },
     { name = "pytest", specifier = ">=9.0.3" },
     { name = "pytest-asyncio", specifier = ">=1.3.0" },
+    { name = "pytest-cov", specifier = ">=6.0.0" },
     { name = "ruff", specifier = ">=0.9.0" },
     { name = "sqlalchemy", extras = ["asyncio"], specifier = ">=2.0.38" },
     { name = "twine", specifier = ">=6.2.0" },
diff --git a/example/database-app/uv.lock b/example/database-app/uv.lock
index aa0ae8bb..3ae36732 100644
--- a/example/database-app/uv.lock
+++ b/example/database-app/uv.lock
@@ -498,7 +498,7 @@ wheels = [
 
 [[package]]
 name = "fastapi-startkit"
-version = "0.26.0"
+version = "0.40.1"
 source = { editable = "../../fastapi_startkit" }
 dependencies = [
     { name = "cleo" },
@@ -527,23 +527,26 @@ postgres = [
 requires-dist = [
     { name = "aiomysql", marker = "extra == 'mysql'", specifier = ">=0.2.0" },
     { name = "aiosqlite", marker = "extra == 'sqlite'", specifier = ">=0.22.1" },
+    { name = "anthropic", marker = "extra == 'ai'", specifier = ">=0.49.0" },
     { name = "asyncpg", marker = "extra == 'postgres'", specifier = ">=0.29.0" },
     { name = "cleo", specifier = ">=2.1.0,<3.0.0" },
     { name = "dotenv", specifier = ">=0.9.9" },
     { name = "dotty-dict", specifier = ">=1.3.1" },
     { name = "faker", marker = "extra == 'database'", specifier = ">=40.13.0" },
     { name = "fastapi", extras = ["standard"], marker = "extra == 'fastapi'", specifier = ">=0.124.4,<0.125.0" },
+    { name = "google-generativeai", marker = "extra == 'ai'", specifier = ">=0.8.0" },
     { name = "inflection", specifier = ">=0.5.1" },
     { name = "itsdangerous", marker = "extra == 'fastapi'", specifier = ">=2.2.0" },
     { name = "jinja2", marker = "extra == 'inertia'", specifier = ">=3.1" },
     { name = "jinja2", marker = "extra == 'vite'", specifier = ">=3.1" },
     { name = "markupsafe", marker = "extra == 'inertia'", specifier = ">=2.0" },
+    { name = "openai", marker = "extra == 'ai'", specifier = ">=1.0.0" },
     { name = "pendulum", specifier = ">=3.1.0,<4.0.0" },
     { name = "pydantic", specifier = ">=2.12.5" },
     { name = "requests", specifier = ">=2.32.5,<3.0.0" },
     { name = "sqlalchemy", extras = ["asyncio"], marker = "extra == 'database'", specifier = ">=2.0.38" },
 ]
-provides-extras = ["fastapi", "database", "sqlite", "postgres", "mysql", "vite", "inertia"]
+provides-extras = ["fastapi", "database", "sqlite", "postgres", "mysql", "vite", "inertia", "ai"]
 
 [package.metadata.requires-dev]
 dev = [
@@ -551,10 +554,12 @@ dev = [
     { name = "aiosqlite", specifier = ">=0.22.1" },
     { name = "asyncpg", specifier = ">=0.29.0" },
     { name = "dumpdie", specifier = ">=1.5.0" },
+    { name = "faker", specifier = ">=40.13.0" },
     { name = "fastapi", extras = ["standard"], specifier = ">=0.124.4" },
     { name = "itsdangerous", specifier = ">=2.2.0" },
     { name = "pytest", specifier = ">=9.0.3" },
     { name = "pytest-asyncio", specifier = ">=1.3.0" },
+    { name = "pytest-cov", specifier = ">=6.0.0" },
     { name = "ruff", specifier = ">=0.9.0" },
     { name = "sqlalchemy", extras = ["asyncio"], specifier = ">=2.0.38" },
     { name = "twine", specifier = ">=6.2.0" },
diff --git a/fastapi_startkit/src/fastapi_startkit/masoniteorm/connections/manager.py b/fastapi_startkit/src/fastapi_startkit/masoniteorm/connections/manager.py
index b988397d..b7c10262 100644
--- a/fastapi_startkit/src/fastapi_startkit/masoniteorm/connections/manager.py
+++ b/fastapi_startkit/src/fastapi_startkit/masoniteorm/connections/manager.py
@@ -41,5 +41,6 @@ def get_schema_builder(self):
 
     async def clear(self):
         for conn in self.connections.values():
+            await conn.close()
             await conn.engine.dispose()
         self.connections.clear()
diff --git a/fastapi_startkit/tests/masoniteorm/models/test_model_attributes.py b/fastapi_startkit/tests/masoniteorm/models/test_model_attributes.py
index dc4d3d2e..40a4b5bf 100644
--- a/fastapi_startkit/tests/masoniteorm/models/test_model_attributes.py
+++ b/fastapi_startkit/tests/masoniteorm/models/test_model_attributes.py
@@ -25,8 +25,10 @@
 
 
 @pytest.fixture
-def db():
-    return DatabaseManager(ConnectionFactory(), SQLITE_CONFIG)
+async def db():
+    manager = DatabaseManager(ConnectionFactory(), SQLITE_CONFIG)
+    yield manager
+    await manager.clear()
 
 
 @pytest.fixture
diff --git a/fastapi_startkit/tests/masoniteorm/models/test_model_query.py b/fastapi_startkit/tests/masoniteorm/models/test_model_query.py
index 6483a0b3..766dbe6b 100644
--- a/fastapi_startkit/tests/masoniteorm/models/test_model_query.py
+++ b/fastapi_startkit/tests/masoniteorm/models/test_model_query.py
@@ -30,8 +30,10 @@
 
 
 @pytest.fixture
-def db():
-    return DatabaseManager(ConnectionFactory(), SQLITE_CONFIG)
+async def db():
+    manager = DatabaseManager(ConnectionFactory(), SQLITE_CONFIG)
+    yield manager
+    await manager.clear()
 
 
 @pytest.fixture
diff --git a/fastapi_startkit/uv.lock b/fastapi_startkit/uv.lock
index 54c7e7b3..947f8d4b 100644
--- a/fastapi_startkit/uv.lock
+++ b/fastapi_startkit/uv.lock
@@ -593,7 +593,7 @@ wheels = [
 
 [[package]]
 name = "fastapi-startkit"
-version = "0.40.0"
+version = "0.40.1"
 source = { editable = "." }
 dependencies = [
     { name = "cleo" },