diff --git a/DigitalData.Core.Security/DIExtensions.cs b/DigitalData.Core.Security/DIExtensions.cs
index bc7688b..b9a32dc 100644
--- a/DigitalData.Core.Security/DIExtensions.cs
+++ b/DigitalData.Core.Security/DIExtensions.cs
@@ -3,7 +3,6 @@ using DigitalData.Core.Security.Config;
 using DigitalData.Core.Security.Cryptographer;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -22,31 +21,23 @@ namespace DigitalData.Core.Security
             return options;
         }
 
-        private static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services)
-            where TAsymCryptParams : AsymCryptParams
-        {
-            services.TryAddScoped<IAsymCryptService<TAsymCryptParams>, AsymCryptService<TAsymCryptParams>>();
-            return services;
-        }
+        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) 
             where TAsymCryptParams : AsymCryptParams
-                => services.Configure<TAsymCryptParams>(section).AddAsymCryptService<TAsymCryptParams>();
+            => services.Configure<TAsymCryptParams>(section).AddAsymCryptService<TAsymCryptParams>();
 
         public static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, TAsymCryptParams param)
             where TAsymCryptParams : AsymCryptParams
-                => services.AddSingleton(Options.Create(param)).AddAsymCryptService<TAsymCryptParams>();
+            => services.AddSingleton(Options.Create(param)).AddAsymCryptService<TAsymCryptParams>();
 
         /// <summary>
         /// Registers default RSA Factory instance with default params
         /// </summary>
         /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddRSAFactory(this IServiceCollection services)
-        {
-            services.TryAddScoped(_ => Instance.RSAFactory);
-            return services;
-        }
+        /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
+        public static IServiceCollection AddRSAFactory(this IServiceCollection services) => services.AddScoped(_ => Instance.RSAFactory);
 
         /// <summary>
         /// Registers a custom RSA Factory instance with specified parameters from the given configuration section.
@@ -54,13 +45,15 @@ namespace DigitalData.Core.Security
         /// <typeparam name="TRSAFactoryParams"></typeparam>
         /// <param name="services"></param>
         /// <param name="section"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, IConfigurationSection section)
+        /// <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>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
+        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, IConfigurationSection section, bool setAsDefault = false)
             where TRSAFactoryParams : RSAFactoryParams
         {
             services.Configure<TRSAFactoryParams>(section);
-            services.TryAddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
-            return services;
+            return setAsDefault
+                ? services.AddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>()
+                : services.AddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
         }
 
         /// <summary>
@@ -74,12 +67,10 @@ namespace DigitalData.Core.Security
         public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, TRSAFactoryParams rsaParams, bool setAsDefault = false)
             where TRSAFactoryParams : RSAFactoryParams
         {
-            services.TryAddSingleton(Options.Create(rsaParams));
-            if (setAsDefault)
-                services.TryAddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>();
-            else
-                services.TryAddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
-            return services;
+            services.AddSingleton(Options.Create(rsaParams));
+            return setAsDefault
+                ? services.AddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>()
+                : services.AddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
         }
     }
 }
\ No newline at end of file