diff --git a/Directory.Build.props b/Directory.Build.props
index f17c725..3b6fdf8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
 		<TargetFrameworks>net8.0</TargetFrameworks>
-		<Version>1.0-rc.5</Version>
+		<Version>1.0-rc.6</Version>
         <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
         <Deterministic>true</Deterministic>
         <Features>strict</Features>
diff --git a/src/features/Database/DatabaseFeature.cs b/src/features/Database/DatabaseFeature.cs
index 8db27a3..2a88acf 100644
--- a/src/features/Database/DatabaseFeature.cs
+++ b/src/features/Database/DatabaseFeature.cs
@@ -7,11 +7,30 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
+public enum DatabaseSetupKind
+{
+    Classic,
+    Factory,
+    Pool,
+    FactoryPool
+}
+
 [PublicAPI]
-public record DatabaseFeature<T>(Action<IDatabaseAdapter> Setup, IAppCreationContext BuildContext) : AppFeature, IAppFeatureWithHealthCheck where T : DbContext
+public record DatabaseFeature<T>(Action<IDatabaseAdapter> Setup, IAppCreationContext BuildContext, DatabaseSetupKind Kind) : AppFeature, IAppFeatureWithHealthCheck where T : DbContext
 {
     public override void BeforeRegistrations(WebApplicationBuilder webBuilder)
-        => webBuilder.Services.AddDbContext<T>(x => this.Setup(new DatabaseAdapter(x, BuildContext)));
+    {
+        _ = this.Kind switch {
+            DatabaseSetupKind.Classic => webBuilder.Services.AddDbContext<T>(x =>
+                this.Setup(new DatabaseAdapter(x, this.BuildContext))),
+            DatabaseSetupKind.Factory => webBuilder.Services.AddDbContextFactory<T>(x =>
+                this.Setup(new DatabaseAdapter(x, this.BuildContext))),
+            DatabaseSetupKind.Pool => webBuilder.Services.AddDbContextPool<T>(x =>
+                this.Setup(new DatabaseAdapter(x, this.BuildContext))),
+            DatabaseSetupKind.FactoryPool => webBuilder.Services.AddPooledDbContextFactory<T>(x =>
+                this.Setup(new DatabaseAdapter(x, this.BuildContext)))
+        };
+    }
 
     public override void BeforeRun(WebApplication webBuilder)
         => webBuilder.WarmUp<T>();
diff --git a/src/features/Database/DatabaseFeatureIAppBuilder.cs b/src/features/Database/DatabaseFeatureIAppBuilder.cs
index e330f17..9b8afd7 100644
--- a/src/features/Database/DatabaseFeatureIAppBuilder.cs
+++ b/src/features/Database/DatabaseFeatureIAppBuilder.cs
@@ -8,5 +8,12 @@
 public static class DatabaseFeatureIAppBuilder
 {
     public static IAppBuilder Database<T>(this IAppBuilder builder, Action<IDatabaseAdapter> setup) where T : DbContext
-        => builder.InjectFeature((x) => new DatabaseFeature<T>(setup, x));
+        => builder.InjectFeature((x) => new DatabaseFeature<T>(setup, x, DatabaseSetupKind.Classic));
+    public static IAppBuilder PooledDatabase<T>(this IAppBuilder builder, Action<IDatabaseAdapter> setup) where T : DbContext
+        => builder.InjectFeature((x) => new DatabaseFeature<T>(setup, x, DatabaseSetupKind.Pool));
+
+    public static IAppBuilder FactoryPooledDatabase<T>(this IAppBuilder builder, Action<IDatabaseAdapter> setup) where T : DbContext
+        => builder.InjectFeature((x) => new DatabaseFeature<T>(setup, x, DatabaseSetupKind.FactoryPool));
+    public static IAppBuilder FactoryDatabase<T>(this IAppBuilder builder, Action<IDatabaseAdapter> setup) where T : DbContext
+        => builder.InjectFeature((x) => new DatabaseFeature<T>(setup, x, DatabaseSetupKind.Factory));
 }