diff --git a/Shop/Components/Pages/Contact.razor.cs b/Shop/Components/Pages/Contact.razor.cs
index f4611fb..5a38f65 100644
--- a/Shop/Components/Pages/Contact.razor.cs
+++ b/Shop/Components/Pages/Contact.razor.cs
@@ -1,7 +1,7 @@
-using LiteCharms.Abstractions;
-using LiteCharms.Features.Email.Events;
-using LiteCharms.Models;
-using static LiteCharms.Abstractions.Constants;
+using LiteCharms.Features.Email.Events;
+using LiteCharms.Features.Email.Models;
+using LiteCharms.Features.ServiceBus.Abstractions;
+using static LiteCharms.Features.ServiceBus.Constants;
 
 namespace Shop.Components.Pages;
 
diff --git a/Shop/Program.cs b/Shop/Program.cs
index ce75316..9f284ee 100644
--- a/Shop/Program.cs
+++ b/Shop/Program.cs
@@ -1,6 +1,6 @@
-using LiteCharms.Extensions;
+using LiteCharms.Features.Extensions;
 using Shop.Components;
-using static LiteCharms.Abstractions.Constants;
+using static LiteCharms.Features.Email.Extensions.Constants;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -15,11 +15,15 @@ builder.Services.AddEndpointsApiExplorer();
 
 builder.Services.AddMediator();
 builder.Services.AddSalesServiceBus();
-builder.Services.AddEmailServiceBus();
 builder.Services.AddGeneralServiceBus();
-builder.Services.AddShopDatabase(builder.Configuration);
 builder.Services.AddQuartzSchedulerClient(ShopSchedulerName, builder.Configuration);
 
+builder.Services.AddEmailServices(builder.Configuration);
+builder.Services.AddEmailServiceBus();
+
+builder.Services.AddShopServices();
+builder.Services.AddShopDatabase(builder.Configuration);
+
 builder.Services.AddPostgresHealtchCheck();
 builder.Services.AddQuartzHealtchCheck();
 builder.Services.AddHealthChecksSupport(builder.Configuration);
diff --git a/Shop/Shop.csproj b/Shop/Shop.csproj
index 54d1efd..779e028 100644
--- a/Shop/Shop.csproj
+++ b/Shop/Shop.csproj
@@ -17,9 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Extensions" Version="1.20.0" />
-    <PackageReference Include="LiteCharms.Features" Version="1.20.0" />
-    <PackageReference Include="LiteCharms.Models" Version="1.20.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.25.0" />
     <PackageReference Include="Polly" Version="8.6.6" />
   </ItemGroup>
 
diff --git a/Shop/appsettings.json b/Shop/appsettings.json
index aec5c2e..0bc1570 100644
--- a/Shop/appsettings.json
+++ b/Shop/appsettings.json
@@ -15,7 +15,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Error"
     }
   },
   "AllowedHosts": "*"