diff --git a/src/Shared/StellarChat.Shared.Infrastructure/Extensions.cs b/src/Shared/StellarChat.Shared.Infrastructure/Extensions.cs
index c044729..6c295e0 100644
--- a/src/Shared/StellarChat.Shared.Infrastructure/Extensions.cs
+++ b/src/Shared/StellarChat.Shared.Infrastructure/Extensions.cs
@@ -31,7 +31,8 @@ public static WebApplicationBuilder AddSharedInfrastructure(this WebApplicationB
                 .AddCorsPolicy(builder.Configuration)
                 .AddMongo(builder.Configuration)
                 .RegisterEndpoints(builder.Configuration)
-                .AddSemanticKernel(builder.Configuration);
+                .AddSemanticKernel(builder.Configuration)
+                .AddMediator();
 
         return builder;
     }
diff --git a/src/Shared/StellarChat.Shared.Infrastructure/StellarChat.Shared.Infrastructure.csproj b/src/Shared/StellarChat.Shared.Infrastructure/StellarChat.Shared.Infrastructure.csproj
index 0182cb6..b6ace02 100644
--- a/src/Shared/StellarChat.Shared.Infrastructure/StellarChat.Shared.Infrastructure.csproj
+++ b/src/Shared/StellarChat.Shared.Infrastructure/StellarChat.Shared.Infrastructure.csproj
@@ -11,6 +11,11 @@
   </ItemGroup>  
 	
   <ItemGroup>
+	  <PackageReference Include="Mediator.Abstractions" Version="3.0.0-preview.24" />
+	  <PackageReference Include="Mediator.SourceGenerator" Version="3.0.0-preview.24">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
 	  <PackageReference Include="Microsoft.SemanticKernel" Version="1.6.3" />
 	  <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
 	  <PackageReference Include="Serilog" Version="4.0.0-dev-02113" />