diff --git a/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs b/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs
index 0fc5e36..2cb0921 100644
--- a/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs
+++ b/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs
@@ -1,13 +1,28 @@
-using Microsoft.Extensions.DependencyInjection;
+using AutoMapper;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DigitalData.Core.Infrastructure.AutoMapper;
 
 public static class DependencyInjection
 {
-    public static IServiceCollection AddEntityAutoMapper(this IServiceCollection services, Action<EntityAutoMapperOptions> entityAutoMapperOptionsAction)
+    public static EntityConfigurationOptions<TEntity> UseAutoMapper<TEntity>(this EntityConfigurationOptions<TEntity> options, params Type[] typeOfDtos)
     {
-        EntityAutoMapperOptions options = new(services);
-        entityAutoMapperOptionsAction.Invoke(options);
-        return services;
+        IMapper? customRootMapper = null;
+
+        if (typeOfDtos.Length != 0)
+        {
+            MapperConfigurationExpression AutoMapperConfiguration = new();
+
+            foreach (var typeOfDto in typeOfDtos)
+            {
+                AutoMapperConfiguration.CreateMap(typeof(TEntity), typeOfDto);
+                AutoMapperConfiguration.CreateMap(typeOfDto, typeof(TEntity));
+            }
+
+            customRootMapper = new MapperConfiguration(AutoMapperConfiguration).CreateMapper();
+        }
+
+        options.AddCustomMapper(provider => new EntityAutoMapper<TEntity>(customRootMapper ?? provider.GetRequiredService<IMapper>()));
+        return options;
     }
 }
diff --git a/DigitalData.Core.Infrastructure.AutoMapper/DigitalData.Core.Infrastructure.AutoMapper.csproj b/DigitalData.Core.Infrastructure.AutoMapper/DigitalData.Core.Infrastructure.AutoMapper.csproj
index 6a1f700..cb10076 100644
--- a/DigitalData.Core.Infrastructure.AutoMapper/DigitalData.Core.Infrastructure.AutoMapper.csproj
+++ b/DigitalData.Core.Infrastructure.AutoMapper/DigitalData.Core.Infrastructure.AutoMapper.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\DigitalData.Core.Abstractions\DigitalData.Core.Abstractions.csproj" />
+    <ProjectReference Include="..\DigitalData.Core.Infrastructure\DigitalData.Core.Infrastructure.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/DigitalData.Core.Infrastructure.AutoMapper/EntityAutoMapperOptions.cs b/DigitalData.Core.Infrastructure.AutoMapper/EntityAutoMapperOptions.cs
deleted file mode 100644
index 5aabf06..0000000
--- a/DigitalData.Core.Infrastructure.AutoMapper/EntityAutoMapperOptions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstractions.Infrastructure;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace DigitalData.Core.Infrastructure.AutoMapper;
-
-public class EntityAutoMapperOptions
-{
-    public readonly MapperConfigurationExpression AutoMapperConfiguration = new ();
-
-    private readonly IServiceCollection _services;
-
-    private readonly Lazy<IMapper> _lazyCustomRootMapper;
-
-    internal EntityAutoMapperOptions(IServiceCollection services)
-    {
-        _services = services;
-        _lazyCustomRootMapper = new(() => new MapperConfiguration(AutoMapperConfiguration).CreateMapper());
-    }
-
-    public void CreateEntityMap<TEntity>(params Type[] typeOfDtos)
-    {
-        foreach (var typeOfDto in typeOfDtos)
-        {
-            AutoMapperConfiguration.CreateMap(typeof(TEntity), typeOfDto);
-            AutoMapperConfiguration.CreateMap(typeOfDto, typeof(TEntity));
-        }
-
-        _services.AddSingleton<IEntityMapper<TEntity>, EntityAutoMapper<TEntity>>(provider => new EntityAutoMapper<TEntity>(_lazyCustomRootMapper.Value));
-    }
-
-    public void CreateEntityMap<TEntity>() => _services.AddSingleton<IEntityMapper<TEntity>, EntityAutoMapper<TEntity>>();
-}
diff --git a/DigitalData.Core.Infrastructure/DependencyInjection.cs b/DigitalData.Core.Infrastructure/DependencyInjection.cs
index 9d656bd..ee55815 100644
--- a/DigitalData.Core.Infrastructure/DependencyInjection.cs
+++ b/DigitalData.Core.Infrastructure/DependencyInjection.cs
@@ -6,12 +6,14 @@ namespace DigitalData.Core.Infrastructure;
 
 public static class DependencyInjection
 {
-    public static IServiceCollection AddDbRepository<TDbContext, TEntity>(this IServiceCollection services, Func<TDbContext, DbSet<TEntity>> queryFactory)
+    public static EntityConfigurationOptions<TEntity> AddDbRepository<TDbContext, TEntity>(this IServiceCollection services, Func<TDbContext, DbSet<TEntity>> queryFactory)
         where TDbContext : DbContext
         where TEntity : class
     {
-        return services
+        services
             .AddScoped<IRepository<TEntity>, DbRepository<TDbContext, TEntity>>()
             .AddSingleton(queryFactory);
+
+        return new EntityConfigurationOptions<TEntity>(services);
     }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs b/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs
new file mode 100644
index 0000000..852907d
--- /dev/null
+++ b/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs
@@ -0,0 +1,20 @@
+using DigitalData.Core.Abstractions.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DigitalData.Core.Infrastructure;
+
+public class EntityConfigurationOptions<TEntity>
+{
+    private readonly IServiceCollection _services;
+
+    public EntityConfigurationOptions(IServiceCollection services)
+    {
+        _services = services;
+    }
+
+    public EntityConfigurationOptions<TEntity> AddCustomMapper(Func<IServiceProvider, IEntityMapper<TEntity>> factory)
+    {
+        _services.AddSingleton(factory);
+        return this;
+    }
+}