diff --git a/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs b/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs
index 4e7b5a6..2b5888b 100644
--- a/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/Extensions.cs
@@ -4,20 +4,6 @@ namespace DigitalData.Core.Abstraction.Application.Repository;
 
 public static class Extensions
 {
-    #region Create
-    public static Task<TEntity> CreateAsync<TEntity, TDto>(this IRepository<TEntity> repository, TDto dto, CancellationToken ct = default)
-    {
-        var entity = repository.Mapper.Map<TEntity>(dto);
-        return repository.CreateAsync(entity, ct);
-    }
-
-    public static Task<IEnumerable<TEntity>> CreateAsync<TEntity, TDto>(this IRepository<TEntity> repository, IEnumerable<TDto> dtos, CancellationToken ct = default)
-    {
-        var entities = dtos.Select(dto => repository.Mapper.Map<TEntity>(dto));
-        return repository.CreateAsync(entities, ct);
-    }
-    #endregion
-
     #region IRepository
     #region Read
     public static IEnumerable<TEntity> GetAll<TEntity>(this IRepository repository) where TEntity : IEntity 
diff --git a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
index 1e94a62..eaa8484 100644
--- a/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
+++ b/DigitalData.Core.Abstraction.Application/Repository/IRepository.cs
@@ -1,29 +1,38 @@
-using AutoMapper;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 
 namespace DigitalData.Core.Abstraction.Application.Repository;
 
 public interface IRepository<TEntity>
 {
-    public IMapper Mapper { get; }
-
+    #region Create
     public Task<TEntity> CreateAsync(TEntity entity, CancellationToken cancel = default);
 
     public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken cancel = default);
 
+    public Task<TEntity> CreateAsync<TDto>(TDto dto, CancellationToken cancel = default);
+
+    public Task<IEnumerable<TEntity>> CreateAsync<TDto>(IEnumerable<TDto> dtos, CancellationToken cancel = default);
+    #endregion Create
+
+    #region Read
     public IQueryable<TEntity> Where(Expression<Func<TEntity, bool>> expression);
 
     public IEnumerable<TEntity> GetAll();
 
     public Task<IEnumerable<TEntity>> GetAllAsync(CancellationToken cancel = default);
+    #endregion Read
 
+    #region Update
     public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken cancel = default);
 
     public Task UpdateAsync<TDto>(TDto dto, Func<IQueryable<TEntity>, IQueryable<TEntity>> query, CancellationToken cancel = default);
+    #endregion Update
 
+    #region Delete
     public Task DeleteAsync(Expression<Func<TEntity, bool>> expression, CancellationToken cancel = default);
 
     public Task DeleteAsync(Func<IQueryable<TEntity>, IQueryable<TEntity>> query, CancellationToken cancel = default);
+    #endregion Delete
 
     #region Obsolete
     [Obsolete("Use CreateAsync, UpdateAsync or DeleteAsync")]