diff --git a/DigitalData.Core.Security.Extensions/RSAExtensions.cs b/DigitalData.Core.Security.Extensions/RSAExtensions.cs
index ccb0102..889656a 100644
--- a/DigitalData.Core.Security.Extensions/RSAExtensions.cs
+++ b/DigitalData.Core.Security.Extensions/RSAExtensions.cs
@@ -13,34 +13,11 @@ namespace DigitalData.Core.Security.Extensions
             return rsa;
         }
 
-        public static bool TryGetEncryptor(this IDictionary<string, IRSAEncryptor> pairs, string issuer, string audience, out IRSAEncryptor? encryptor) 
-            => pairs.TryGetValue($"{issuer}:{audience}", out encryptor);
+        public static IRSADecryptor GetRSADecryptor(this ICryptFactory factory, string issuer, string audience, Version? version = null, string? seperator = null)
+            => factory[factory.RSAKeyNameFormatter(issuer, audience, true, version, seperator)];
 
-        public static IRSAEncryptor? GetEncryptor(this IDictionary<string, IRSAEncryptor> pairs, string issuer, string audience) 
-            => pairs.TryGetEncryptor(issuer: issuer, audience: audience, out var encryptor) ? encryptor : null;
-
-        public static IRSADecryptor GetRSADecryptor(this ICryptFactory factory, string issuer, string audience)
-            => factory[$"{issuer}:{audience}"];
-
-        public static bool TryGetRSADecryptor(this ICryptFactory factory, string issuer, string audience, out IRSADecryptor? decryptor)
-            => factory.TryGetRSADecryptor($"{issuer}:{audience}", out decryptor);
-
-        public static IRSAEncryptor GetRSAEncryptor(this ICryptFactory factory, string issuer, string audience)
-            => factory[$"{issuer}:{audience}"].Encryptor;
-
-        public static bool TryGetRSADecryptor(this ICryptFactory factory, string issuer, string audience, out IRSAEncryptor? encryptor)
-        {
-            if(factory.TryGetRSADecryptor($"{issuer}:{audience}", out var decryptor) && decryptor is not null)
-            {
-                encryptor = decryptor.Encryptor;
-                return true;
-            }
-            else
-            {
-                encryptor = null;
-                return false;
-            }
-        }
+        public static bool TryGetRSADecryptor(this ICryptFactory factory, string issuer, string audience, out IRSADecryptor? decryptor, Version? version = null, string? seperator = null)
+            => factory.TryGetRSADecryptor(factory.RSAKeyNameFormatter(issuer, audience, true, version, seperator), out decryptor);
 
         private static string CreatePath(string key, string? directory = null)
         {
@@ -85,11 +62,5 @@ namespace DigitalData.Core.Security.Extensions
                 fileLock.Release();
             }
         }
-
-        public static void SavePem(this IRSACryptographer decryptor, string issuer, string audience, string? directory = null)
-            => decryptor.SavePem($"{issuer}:{audience}", directory);
-
-        public static async Task SavePemAsync(this IRSACryptographer decryptor, string issuer, string audience, string? directory = null)
-            => await decryptor.SavePemAsync($"{issuer}:{audience}", directory);
     }
 }
\ No newline at end of file
diff --git a/DigitalData.Core.Security/CryptFactory.cs b/DigitalData.Core.Security/CryptFactory.cs
index d1578e8..0549cd2 100644
--- a/DigitalData.Core.Security/CryptFactory.cs
+++ b/DigitalData.Core.Security/CryptFactory.cs
@@ -1,6 +1,5 @@
 using DigitalData.Core.Abstractions.Security;
 using Microsoft.Extensions.Logging;
-using System.Text;
 
 namespace DigitalData.Core.Security
 {