diff --git a/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs b/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs
index 0f85ab1..5d9b6da 100644
--- a/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs
+++ b/DigitalData.Core.Abstractions/Security/IAsymCryptService.cs
@@ -10,6 +10,4 @@
 
         IEnumerable<IRSAEncryptor> Encryptors { get; }
     }
-
-    public interface IAsymCryptService<TParams> : IAsymCryptService, IRSAFactory<TParams> { }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Abstractions/Security/IRSAFactory.cs b/DigitalData.Core.Abstractions/Security/IRSAFactory.cs
index 3e7233e..a1e4bb9 100644
--- a/DigitalData.Core.Abstractions/Security/IRSAFactory.cs
+++ b/DigitalData.Core.Abstractions/Security/IRSAFactory.cs
@@ -20,6 +20,4 @@ namespace DigitalData.Core.Abstractions.Security
 
         IRSADecryptor CreateDecryptor(string pem, string? issuer = null, string? audience = null, bool encrypt = false, RSAEncryptionPadding? padding = null);
     }
-
-    public interface IRSAFactory<TParams> : IRSAFactory { }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Security/AsymCryptService.cs b/DigitalData.Core.Security/AsymCryptService.cs
index 41539a2..3c363f2 100644
--- a/DigitalData.Core.Security/AsymCryptService.cs
+++ b/DigitalData.Core.Security/AsymCryptService.cs
@@ -7,8 +7,7 @@ using System.Collections;
 
 namespace DigitalData.Core.Security
 {
-    public class AsymCryptService<TAsymCryptParams> : RSAFactory<TAsymCryptParams>, IAsymCryptService<TAsymCryptParams>, IRSAFactory<TAsymCryptParams>, IEnumerable<IRSADecryptor>
-        where TAsymCryptParams : AsymCryptParams
+    public class AsymCryptService : RSAFactory<AsymCryptParams>, IAsymCryptService, IRSAFactory, IEnumerable<IRSADecryptor>
     {
         public IEnumerable<IRSADecryptor> Decryptors { get; }
         
@@ -38,7 +37,7 @@ namespace DigitalData.Core.Security
                 index,
                 $"The index {index} is out of range. The valid indices for {GetType()} are between 0 and {Decryptors.Count() - 1} (inclusive). Please ensure the index is within this range.");
 
-        public AsymCryptService(IOptions<TAsymCryptParams> options, ILogger<AsymCryptService<TAsymCryptParams>>? logger = null) : base(options)
+        public AsymCryptService(IOptions<AsymCryptParams> options, ILogger<AsymCryptService>? logger = null) : base(options)
         {
             logger?.LogInformation("Core.Secrets version: {Version}, Created on: {CreationDate}.", Secrets.Version, Secrets.CreationDate.ToString("dd.MM.yyyy"));
 
diff --git a/DigitalData.Core.Security/Cryptographer/RSAFactory.cs b/DigitalData.Core.Security/Cryptographer/RSAFactory.cs
index 609fbe5..299035a 100644
--- a/DigitalData.Core.Security/Cryptographer/RSAFactory.cs
+++ b/DigitalData.Core.Security/Cryptographer/RSAFactory.cs
@@ -5,7 +5,7 @@ using System.Security.Cryptography;
 
 namespace DigitalData.Core.Security.Cryptographer
 {
-    public class RSAFactory<TRSAFactoryParams> : IRSAFactory<TRSAFactoryParams> where TRSAFactoryParams : RSAFactoryParams
+    public class RSAFactory<TRSAFactoryParams> : IRSAFactory where TRSAFactoryParams : RSAFactoryParams
     {
         protected readonly TRSAFactoryParams _params;
 
diff --git a/DigitalData.Core.Security/DIExtensions.cs b/DigitalData.Core.Security/DIExtensions.cs
index 2d57ced..70f1b5c 100644
--- a/DigitalData.Core.Security/DIExtensions.cs
+++ b/DigitalData.Core.Security/DIExtensions.cs
@@ -10,122 +10,43 @@ namespace DigitalData.Core.Security
 {
     public static class DIExtensions
     {
-        private static (bool Added, object Lock) _mappingProfile = (false, new());
-        private static IServiceCollection AddMappingProfile(this IServiceCollection services)
-        {
-            if (_mappingProfile.Added)
-                return services;
-
-            lock (_mappingProfile.Lock)
-            {
-                if (_mappingProfile.Added)
-                    return services;
-
-                _mappingProfile.Added = true;
-                return services
-                    .AddAutoMapper(typeof(MappingProfile).Assembly)
-                    .AddSingleton<TokenDescriptorMapper>();
-            }
-        }
-
         private static IServiceCollection AddParamsConfigureOptions<TParams>(this IServiceCollection services) where TParams : RSAFactoryParams
             => services.AddSingleton<IConfigureOptions<TParams>, ParamsConfigureOptions<TParams>>();
 
-        private static IServiceCollection AddAsymCryptService<TAsymCryptParams>(this IServiceCollection services, bool setAsDefault = false) where TAsymCryptParams : AsymCryptParams
-        {
-            services.AddParamsConfigureOptions<TAsymCryptParams>().AddMappingProfile();
-            return setAsDefault
-                ? services.AddSingleton<IAsymCryptService, AsymCryptService<TAsymCryptParams>>()
-                : services.AddSingleton<IAsymCryptService<TAsymCryptParams>, AsymCryptService<TAsymCryptParams>>();
-        }
+        private static IServiceCollection AddAsymCryptService(this IServiceCollection services) => services
+            .AddParamsConfigureOptions<AsymCryptParams>()
+            .AddAutoMapper(typeof(MappingProfile).Assembly)
+            .AddSingleton<IAsymCryptService, AsymCryptService>();
 
         /// <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>(setAsDefault: setAsDefault);
-
-        /// <summary>
-        /// Registers a custom asym crypt service with default parameters from the given configuration section.
-        /// </summary>
-        /// <param name="services"></param>
-        /// <param name="section"></param>
-        /// <param name="setAsDefault"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddAsymCryptService(this IServiceCollection services, IConfigurationSection section, bool setAsDefault = false)
-            => services.Configure<AsymCryptParams>(section).AddAsymCryptService<AsymCryptParams>(setAsDefault: setAsDefault);
-
-        /// <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>(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, RSAFactoryParams? factoryParams = null) => services
-            .AddParamsConfigureOptions<RSAFactoryParams>()
-            .AddMappingProfile()
-            .AddScoped<IRSAFactory>(_ => new RSAFactory<RSAFactoryParams>(Options.Create(factoryParams ?? new())));
+        public static IServiceCollection AddAsymCryptService(this IServiceCollection services, IConfigurationSection section) => services
+            .Configure<AsymCryptParams>(section)
+            .AddAsymCryptService();
+
+        /// <summary>
+        /// Registers an asym crypt service with the specified parameters from the given instance.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
+        public static IServiceCollection AddAsymCryptService(this IServiceCollection services, AsymCryptParams? asymCryptParams = null) => services
+            .AddSingleton(Options.Create(asymCryptParams ?? new()))
+            .AddAsymCryptService();
 
         /// <summary>
         /// Registers a custom RSA Factory with specified parameters from the given configuration section.
         /// </summary>
-        /// <typeparam name="TRSAFactoryParams"></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>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.AddMappingProfile().AddParamsConfigureOptions<TRSAFactoryParams>().Configure<TRSAFactoryParams>(section);
-            return setAsDefault
-                ? services.AddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>()
-                : services.AddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
-        }
-
-        /// <summary>
-        /// Registers an RSA Factory with the specified parameters from the given instance. Optionally, sets it as the default factory.
-        /// </summary>
-        /// <typeparam name="TRSAFactoryParams">The type of the RSA factory parameters.</typeparam>
-        /// <param name="services"></param>
-        /// <param name="rsaParams"></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>The updated <see cref="IServiceCollection"/> with the RSA Factory registered.</returns>
-        public static IServiceCollection AddRSAFactory<TRSAFactoryParams>(this IServiceCollection services, TRSAFactoryParams rsaParams, bool setAsDefault = false)
-            where TRSAFactoryParams : RSAFactoryParams
-        {
-            services.AddMappingProfile().AddSingleton(Options.Create(rsaParams));
-            return setAsDefault
-                ? services.AddParamsConfigureOptions<TRSAFactoryParams>().AddSingleton<IRSAFactory, RSAFactory<TRSAFactoryParams>>()
-                : services.AddParamsConfigureOptions<TRSAFactoryParams>().AddSingleton<IRSAFactory<TRSAFactoryParams>, RSAFactory<TRSAFactoryParams>>();
-        }
+        public static IServiceCollection AddRSAFactory(this IServiceCollection services, IConfigurationSection section) => services
+            .AddParamsConfigureOptions<RSAFactoryParams>()
+            .Configure<RSAFactoryParams>(section)
+            .AddSingleton<IRSAFactory, RSAFactory<RSAFactoryParams>>();
 
         private static IServiceCollection AddClaimDescriptor<TPrincipal>(this IServiceCollection services,
             Func<TPrincipal, IDictionary<string, object>>? claimsMapper = null,