diff --git a/src/Persistence/InMemory/InMemoryDbContext.cs b/src/Persistence/InMemory/InMemoryDbContext.cs
index fa0cbef..48d0c61 100644
--- a/src/Persistence/InMemory/InMemoryDbContext.cs
+++ b/src/Persistence/InMemory/InMemoryDbContext.cs
@@ -1,8 +1,7 @@
-// using System.Reflection;
-// using cuqmbr.TravelGuide.Domain.Enums;
+using cuqmbr.TravelGuide.Domain.Enums;
 using cuqmbr.TravelGuide.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
-// using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using cuqmbr.TravelGuide.Persistence.TypeConverters;
 
 namespace cuqmbr.TravelGuide.Persistence.InMemory;
 
@@ -19,28 +18,14 @@ public class InMemoryDbContext : DbContext
     protected override void OnModelCreating(ModelBuilder builder)
     {
         base.OnModelCreating(builder);
-
-        // builder.HasPostgresEnum(
-        //     "vehicle_type",
-        //     VehicleType.Enumerations.Select(e => e.Value.Name).ToArray());
-        //
     }
 
     protected override void ConfigureConventions(
         ModelConfigurationBuilder builder)
     {
-        // builder
-        //     .Properties<VehicleType>()
-        //     .HaveColumnType("vehicle_type")
-        //     .HaveConversion<VehicleTypeConverter>();
+        builder
+            .Properties<VehicleType>()
+            .HaveColumnType("vehicle_type")
+            .HaveConversion<VehicleTypeConverter>();
     }
 }
-
-// public class VehicleTypeConverter : ValueConverter<VehicleType, string>
-// {
-//     public VehicleTypeConverter() 
-//         : base(
-//         v => v.Name,
-//         v => VehicleType.FromName(v))
-//     { }
-// }
diff --git a/src/Persistence/PostgreSql/PostgreSqlDbContext.cs b/src/Persistence/PostgreSql/PostgreSqlDbContext.cs
index 43195c1..814849e 100644
--- a/src/Persistence/PostgreSql/PostgreSqlDbContext.cs
+++ b/src/Persistence/PostgreSql/PostgreSqlDbContext.cs
@@ -2,7 +2,7 @@ using System.Reflection;
 using cuqmbr.TravelGuide.Domain.Enums;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using cuqmbr.TravelGuide.Persistence.PostgreSql.TypeConverters;
+using cuqmbr.TravelGuide.Persistence.TypeConverters;
 
 namespace cuqmbr.TravelGuide.Persistence.PostgreSql;
 
diff --git a/src/Persistence/PostgreSql/TypeConverters/VehicleTypeConverter.cs b/src/Persistence/TypeConverters/VehicleTypeConverter.cs
similarity index 71%
rename from src/Persistence/PostgreSql/TypeConverters/VehicleTypeConverter.cs
rename to src/Persistence/TypeConverters/VehicleTypeConverter.cs
index 50f5c9c..2274d4d 100644
--- a/src/Persistence/PostgreSql/TypeConverters/VehicleTypeConverter.cs
+++ b/src/Persistence/TypeConverters/VehicleTypeConverter.cs
@@ -1,11 +1,11 @@
 using cuqmbr.TravelGuide.Domain.Enums;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace cuqmbr.TravelGuide.Persistence.PostgreSql.TypeConverters;
+namespace cuqmbr.TravelGuide.Persistence.TypeConverters;
 
 public class VehicleTypeConverter : ValueConverter<VehicleType, string>
 {
-    public VehicleTypeConverter() 
+    public VehicleTypeConverter()
         : base(
         v => v.Name,
         v => VehicleType.FromName(v))