diff --git a/PyroFetes/Endpoints/Deliverers/CreateDelivererEndpoint.cs b/PyroFetes/Endpoints/Deliverers/CreateDelivererEndpoint.cs
index 6bbe746..c8e0e58 100644
--- a/PyroFetes/Endpoints/Deliverers/CreateDelivererEndpoint.cs
+++ b/PyroFetes/Endpoints/Deliverers/CreateDelivererEndpoint.cs
@@ -5,7 +5,9 @@ using PyroFetes.Models;
 
 namespace PyroFetes.Endpoints.Deliverers;
 
-public class CreateDelivererEndpoint(PyroFetesDbContext database) : Endpoint<CreateDelivererDto, GetDelivererDto>
+public class CreateDelivererEndpoint(
+    PyroFetesDbContext database,
+    AutoMapper.IMapper mapper) : Endpoint<CreateDelivererDto, GetDelivererDto>
 {
     public override void Configure()
     {
@@ -20,15 +22,11 @@ public class CreateDelivererEndpoint(PyroFetesDbContext database) : Endpoint<Cre
         {
             Transporter = req.Transporter,
         };
-        
+
         database.Deliverers.Add(newDeliverer);
-        
+
         await database.SaveChangesAsync(ct);
 
-        await Send.OkAsync(new GetDelivererDto()
-        {
-            Id = newDeliverer.Id,
-            Transporter = req.Transporter,
-        },ct);
+        await Send.OkAsync(mapper.Map<GetDelivererDto>(newDeliverer), ct);
     }
 }
diff --git a/PyroFetes/Endpoints/Deliverers/GetAllDelivererEndpoint.cs b/PyroFetes/Endpoints/Deliverers/GetAllDelivererEndpoint.cs
index 47cafc6..a0ce359 100644
--- a/PyroFetes/Endpoints/Deliverers/GetAllDelivererEndpoint.cs
+++ b/PyroFetes/Endpoints/Deliverers/GetAllDelivererEndpoint.cs
@@ -1,8 +1,7 @@
+using AutoMapper.QueryableExtensions;
 using FastEndpoints;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
 using PyroFetes.DTO.Deliverer.Response;
-using PyroFetes.Models;
 
 namespace PyroFetes.Endpoints.Deliverers;
 
diff --git a/PyroFetes/Endpoints/Deliverers/GetDelivererEndpoint.cs b/PyroFetes/Endpoints/Deliverers/GetDelivererEndpoint.cs
index 35a4b69..b5cfe90 100644
--- a/PyroFetes/Endpoints/Deliverers/GetDelivererEndpoint.cs
+++ b/PyroFetes/Endpoints/Deliverers/GetDelivererEndpoint.cs
@@ -10,7 +10,9 @@ public class GetDelivererRequest
     public int DelivererId { get; set; }
 }
 
-public class GetDelivererEndpoint(PyroFetesDbContext database) : Endpoint<GetDelivererRequest, GetDelivererDto>
+public class GetDelivererEndpoint(
+    PyroFetesDbContext database,
+    AutoMapper.IMapper mapper) : Endpoint<GetDelivererRequest, GetDelivererDto>
 {
     public override void Configure()
     {
@@ -29,11 +31,7 @@ public class GetDelivererEndpoint(PyroFetesDbContext database) : Endpoint<GetDel
             return;
         }
 
-        await Send.OkAsync(new GetDelivererDto()
-        {
-            Id = deliverer.Id,
-            Transporter = deliverer.Transporter,
-        }, ct);
+        await Send.OkAsync(mapper.Map<GetDelivererDto>(deliverer), ct);
     }
 
 }
\ No newline at end of file
diff --git a/PyroFetes/Endpoints/Deliverers/UpdateDelivererEndpoint.cs b/PyroFetes/Endpoints/Deliverers/UpdateDelivererEndpoint.cs
index b8c7a5e..f962ef0 100644
--- a/PyroFetes/Endpoints/Deliverers/UpdateDelivererEndpoint.cs
+++ b/PyroFetes/Endpoints/Deliverers/UpdateDelivererEndpoint.cs
@@ -6,7 +6,9 @@ using PyroFetes.Models;
 
 namespace PyroFetes.Endpoints.Deliverers;
 
-public class UpdateDelivererEndpoint(PyroFetesDbContext database) : Endpoint<UpdateDelivererDto, GetDelivererDto>
+public class UpdateDelivererEndpoint(
+    PyroFetesDbContext database,
+    AutoMapper.IMapper mapper) : Endpoint<UpdateDelivererDto, GetDelivererDto>
 {
     public override void Configure()
     {
@@ -29,11 +31,7 @@ public class UpdateDelivererEndpoint(PyroFetesDbContext database) : Endpoint<Upd
         
         await database.SaveChangesAsync(ct);
 
-        await Send.OkAsync(new GetDelivererDto()
-        {
-            Id = deliverer.Id,
-            Transporter = deliverer.Transporter,
-        }, ct);
+        await Send.OkAsync(mapper.Map<GetDelivererDto>(deliverer), ct);
     }
 
 }
\ No newline at end of file
diff --git a/PyroFetes/PyroFetes.csproj b/PyroFetes/PyroFetes.csproj
index 48c4c03..5cfbe87 100644
--- a/PyroFetes/PyroFetes.csproj
+++ b/PyroFetes/PyroFetes.csproj
@@ -7,6 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="9.3.1" />
         <PackageReference Include="AutoMapper" Version="15.0.1" />
         <PackageReference Include="AutoMapper.Collection" Version="11.0.0" />
         <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
diff --git a/PyroFetes/Repositories/PyrofetesRepository.cs b/PyroFetes/Repositories/PyrofetesRepository.cs
new file mode 100644
index 0000000..0916abd
--- /dev/null
+++ b/PyroFetes/Repositories/PyrofetesRepository.cs
@@ -0,0 +1,8 @@
+using Ardalis.Specification.EntityFrameworkCore;
+
+namespace PyroFetes.Repositories;
+
+public abstract class PyrofetesRepository<T>(PyroFetesDbContext databaseContext, AutoMapper.IMapper mapper) : RepositoryBase<T>(databaseContext) where T : class
+{
+    
+}