diff --git a/src/infrastructure/DigitalData.MessagingService.RabbitMQ/DependencyInjection.cs b/src/infrastructure/DigitalData.MessagingService.RabbitMQ/DependencyInjection.cs
index 45514f4..842f405 100644
--- a/src/infrastructure/DigitalData.MessagingService.RabbitMQ/DependencyInjection.cs
+++ b/src/infrastructure/DigitalData.MessagingService.RabbitMQ/DependencyInjection.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using System;
 
 namespace DigitalData.MessagingService.RabbitMQ
 {
@@ -8,14 +9,31 @@ namespace DigitalData.MessagingService.RabbitMQ
     /// </summary>
     public static class DependencyInjection
     {
+        private static IServiceCollection AddDefaultServices(this IServiceCollection services)
+        {
+            services.AddSingleton<RabbitMqConnectionFactory>();
+            return services;
+        }
+
         /// <summary>
         /// Adds Infrastructure layer services to the DI container
         /// </summary>
-        public static IServiceCollection AddRabbitMqConnectionFactory(
-            this IServiceCollection services,
-            IConfiguration configuration)
+        public static IServiceCollection AddRabbitMqConnectionFactory(this IServiceCollection services, Action<RabbitMqConfiguration> configure)
         {
-            services.AddSingleton<RabbitMqConnectionFactory>();
+            services.AddDefaultServices();
+
+            // --- RabbitMQ Configuration ---
+            services.Configure(configure);
+
+            return services;
+        }
+
+        /// <summary>
+        /// Adds Infrastructure layer services to the DI container
+        /// </summary>
+        public static IServiceCollection AddRabbitMqConnectionFactory(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddDefaultServices();
 
             // --- RabbitMQ Configuration ---
             services.Configure<RabbitMqConfiguration>(
@@ -24,5 +42,4 @@ namespace DigitalData.MessagingService.RabbitMQ
             return services;
         }
     }
-
 }
\ No newline at end of file