diff --git a/src/Arc4u.Standard.MongoDB/DefaultMongoClientFactory.cs b/src/Arc4u.Standard.MongoDB/DefaultMongoClientFactory.cs
index 369e2861..58cc27a4 100644
--- a/src/Arc4u.Standard.MongoDB/DefaultMongoClientFactory.cs
+++ b/src/Arc4u.Standard.MongoDB/DefaultMongoClientFactory.cs
@@ -13,11 +13,11 @@ public DefaultMongoClientFactory(IOptionsMonitor<MongoClientSettings> clientSett
             _mongoContext = (TContext)serviceProvider.GetService(typeof(TContext));
         }
 
-        IMongoDatabase _database;
-        IMongoClient _client;
+        private IMongoDatabase _database;
+        private IMongoClient _client;
         private static object _locker = new object();
-        readonly IOptionsMonitor<MongoClientSettings> _clientSettings;
-        readonly TContext _mongoContext;
+        private readonly IOptionsMonitor<MongoClientSettings> _clientSettings;
+        private readonly TContext _mongoContext;
 
         public IMongoClient CreateClient()
         {
@@ -35,13 +35,24 @@ public IMongoClient CreateClient()
                 {
                     _client = new MongoClient(settings);
                     return _client;
-
                 }
 
                 throw new NullReferenceException($"No mongo client settings defined for key {_mongoContext.DatabaseName}");
             }
+        }
 
+        public IMongoClient CreateClient(MongoClientSettings mongoClientSettings)
+        {
+            if (null == mongoClientSettings) throw new NullReferenceException($"No mongo client settings defined for key {_mongoContext.DatabaseName}");
 
+            lock (_locker)
+            {
+                if (null != _client)
+                    return _client;
+
+                _client = new MongoClient(mongoClientSettings);
+                return _client;
+            }
         }
 
         private IMongoDatabase GetDatabase()
@@ -82,7 +93,6 @@ public IMongoCollection<TEntity> GetCollection<TEntity>()
             var db = GetDatabase();
 
             return db.GetCollection<TEntity>(collectionNames[0]);
-
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Arc4u.Standard.MongoDB/IMongoClientFactory.cs b/src/Arc4u.Standard.MongoDB/IMongoClientFactory.cs
index edaef2d8..a2d556dd 100644
--- a/src/Arc4u.Standard.MongoDB/IMongoClientFactory.cs
+++ b/src/Arc4u.Standard.MongoDB/IMongoClientFactory.cs
@@ -9,9 +9,10 @@ public interface IMongoClientFactory<TContext> where TContext : DbContext
     {
         IMongoClient CreateClient();
 
+        IMongoClient CreateClient(MongoClientSettings mongoClientSettings);
+
         IMongoCollection<TEntity> GetCollection<TEntity>(string collectionName);
 
         IMongoCollection<TEntity> GetCollection<TEntity>();
     }
-
-}
+}
\ No newline at end of file