diff --git a/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs b/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs
index 81088ee..be07e1d 100644
--- a/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs
+++ b/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs
@@ -1,9 +1,11 @@
 namespace DigitalData.Core.Abstractions.Security
 {
-    public interface IAsymCryptService<TParams> : IRSAFactory<TParams>
+    public interface IAsymCryptService : IRSAFactory
     {
         public IEnumerable<IRSADecryptor> Decryptors { get; }
 
         public IEnumerable<IRSAEncryptor> Encryptors { get; }
     }
+
+    public interface IAsymCryptService<TParams> : IAsymCryptService, IRSAFactory<TParams> { }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Security/DIExtensions.cs b/DigitalData.Core.Security/DIExtensions.cs
index b9a32dc..2adbd54 100644
--- a/DigitalData.Core.Security/DIExtensions.cs
+++ b/DigitalData.Core.Security/DIExtensions.cs
@@ -20,27 +20,55 @@ namespace DigitalData.Core.Security
                 options.Converters.Add(new JsonStringEnumConverter());
             return options;
         }
+        
+        private static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, bool setAsDefault = false) where TAsymCryptParams : AsymCryptParams
+            => setAsDefault
+                ? services.AddScoped<IAsymCryptService, AsymCryptService<TAsymCryptParams>>()
+                : services.AddScoped<IAsymCryptService<TAsymCryptParams>, AsymCryptService<TAsymCryptParams>>();
 
-        private static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services) where TAsymCryptParams : AsymCryptParams
-            => services.AddScoped<IAsymCryptService<TAsymCryptParams>, AsymCryptService<TAsymCryptParams>>();
-
-        public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, IConfigurationSection section) 
+        /// <summary>
+        /// Registers a custom asym crypt service with specified parameters from the given configuration section.
+        /// </summary>
+        /// <typeparam name="TAsymCryptParams"></typeparam>
+        /// <param name="services"></param>
+        /// <param name="section"></param>
+        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
+        /// <returns></returns>
+        public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, IConfigurationSection section, bool setAsDefault = false)
             where TAsymCryptParams : AsymCryptParams
-            => services.Configure<TAsymCryptParams>(section).AddAsymCryptService<TAsymCryptParams>();
+            => services.Configure<TAsymCryptParams>(section).AddAsymCryptService<TAsymCryptParams>(setAsDefault: setAsDefault);
 
-        public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, TAsymCryptParams param)
+        /// <summary>
+        /// Registers an asym crypt service with the specified parameters from the given instance. Optionally, sets it as the default factory.
+        /// </summary>
+        /// <typeparam name="TAsymCryptParams"></typeparam>
+        /// <param name="services"></param>
+        /// <param name="param"></param>
+        /// <param name="setAsDefault">If true, the factory is registered as the default <see cref="IRSAFactory"/>. Otherwise, it is registered as <see cref="IRSAFactory{TRSAFactoryParams}"/>.</param>
+        /// <returns></returns>
+        public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, TAsymCryptParams param, bool setAsDefault = false)
             where TAsymCryptParams : AsymCryptParams
-            => services.AddSingleton(Options.Create(param)).AddAsymCryptService<TAsymCryptParams>();
+            => services.AddSingleton(Options.Create(param)).AddAsymCryptService<TAsymCryptParams>(setAsDefault: setAsDefault);
+
+        /// <summary>
+        /// Registers default asym crypt service with the specified parameters from the given instance.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddAsymCryptService(this IServiceCollection services, AsymCryptParams param) => services.AddAsymCryptService(param: param, setAsDefault: true);
 
         /// <summary>
         /// Registers default RSA Factory instance with default params
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="factoryParams"></param>
         /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
-        public static IServiceCollection AddRSAFactory(this IServiceCollection services) => services.AddScoped(_ => Instance.RSAFactory);
-
+        public static IServiceCollection AddRSAFactory(this IServiceCollection services, RSAFactoryParams? factoryParams = null)
+            => services.AddScoped<IRSAFactory>(_ => new RSAFactory<RSAFactoryParams>(Options.Create(factoryParams ?? new())));
+        
         /// <summary>
-        /// Registers a custom RSA Factory instance with specified parameters from the given configuration section.
+        /// Registers a custom RSA Factory with specified parameters from the given configuration section.
         /// </summary>
         /// <typeparam name="TRSAFactoryParams"></typeparam>
         /// <param name="services"></param>