diff --git a/src/Infrastructure/Extensions/AuthenticationSetup.cs b/src/Infrastructure/Extensions/AuthenticationSetup.cs
index 094ce74..0b9c963 100644
--- a/src/Infrastructure/Extensions/AuthenticationSetup.cs
+++ b/src/Infrastructure/Extensions/AuthenticationSetup.cs
@@ -38,7 +38,7 @@ public static class AuthenticationSetup
         services.TryAddSingleton<DefaultTokenHandler>();
         services.TryAddSingleton<IEncryptionService, EncryptionService>();
         services.TryAddSingleton<IPostConfigureOptions<JwtBearerOptions>, JwtBearerOptionsPostConfigureOptions>();
-        services.TryAddSingleton(typeof(ITokenBuilder<>),typeof(TokenBuilderBase<>));
+        services.TryAddSingleton(typeof(ITokenBuilder), typeof(TokenBuilderBase<>));
 
         var key = configuration["AUDIENCE_KEY"] ?? audienceOptions.Secret;
         ArgumentException.ThrowIfNullOrEmpty(key);
diff --git a/src/Infrastructure/Security/DefaultTokenBuilder.cs b/src/Infrastructure/Security/DefaultTokenBuilder.cs
new file mode 100644
index 0000000..ad3dad5
--- /dev/null
+++ b/src/Infrastructure/Security/DefaultTokenBuilder.cs
@@ -0,0 +1,11 @@
+using System.IdentityModel.Tokens.Jwt;
+
+namespace Infrastructure.Security;
+
+public class DefaultTokenBuilder(
+    JwtOptions jwtOptions,
+    JwtSecurityTokenHandler jwtSecurityTokenHandler,
+    IEncryptionService encryptionService)
+    : TokenBuilderBase<long>(jwtOptions, jwtSecurityTokenHandler, encryptionService)
+{
+}
\ No newline at end of file
diff --git a/src/Infrastructure/Security/ITokenBuilder.cs b/src/Infrastructure/Security/ITokenBuilder.cs
index 6252712..164b045 100644
--- a/src/Infrastructure/Security/ITokenBuilder.cs
+++ b/src/Infrastructure/Security/ITokenBuilder.cs
@@ -7,9 +7,9 @@ using Microsoft.IdentityModel.Tokens;
 
 namespace Infrastructure.Security;
 
-public interface ITokenBuilder<TId> where TId : IEquatable<TId>
+public interface ITokenBuilder
 {
-    IList<Claim> GetClaimsFromUserContext(IUserContext<TId> userContext);
+    IList<Claim> GetClaimsFromUserContext<TId>(IUserContext<TId> userContext) where TId : IEquatable<TId>;
 
     void SetUserContext(TokenValidatedContext context);
 
@@ -20,9 +20,9 @@ public abstract class TokenBuilderBase<TId>(
     JwtOptions jwtOptions,
     JwtSecurityTokenHandler jwtSecurityTokenHandler,
     IEncryptionService encryptionService)
-    : ITokenBuilder<TId> where TId : IEquatable<TId>
+    : ITokenBuilder where TId : IEquatable<TId>
 {
-    public IList<Claim> GetClaimsFromUserContext(IUserContext<TId> userContext)
+    public virtual IList<Claim> GetClaimsFromUserContext<TId>(IUserContext<TId> userContext) where TId : IEquatable<TId>
     {
         var claims = new List<Claim>()
         {
@@ -39,7 +39,7 @@ public abstract class TokenBuilderBase<TId>(
         return claims;
     }
 
-    public void SetUserContext(TokenValidatedContext context)
+    public virtual void SetUserContext(TokenValidatedContext context)
     {
         var userContext =
             context.HttpContext.RequestServices.GetService(typeof(IUserContext<TId>)) as IUserContext<TId> ??
@@ -55,7 +55,7 @@ public abstract class TokenBuilderBase<TId>(
         userContext.RemoteIpAddress = context.HttpContext.GetRequestIp()!;
     }
 
-    public JwtTokenInfo GenerateJwtTokenInfo(IReadOnlyCollection<Claim> claims)
+    public virtual JwtTokenInfo GenerateJwtTokenInfo(IReadOnlyCollection<Claim> claims)
     {
         var jwtToken = new JwtSecurityToken(
             issuer: jwtOptions.Issuer,
diff --git a/src/Infrastructure/Security/IUserContext.cs b/src/Infrastructure/Security/IUserContext.cs
index 15f36fc..89f668d 100644
--- a/src/Infrastructure/Security/IUserContext.cs
+++ b/src/Infrastructure/Security/IUserContext.cs
@@ -28,4 +28,8 @@ public abstract class UserContextBase<TId> : IUserContext<TId> where TId : IEqua
     public string[] RoleIds { get; set; }
 
     public string RemoteIpAddress { get; set; }
+}
+
+public class DefaultUserContext : UserContextBase<long>
+{
 }
\ No newline at end of file
diff --git a/src/Infrastructure/Security/JwtBearerOptionsPostConfigureOptions.cs b/src/Infrastructure/Security/JwtBearerOptionsPostConfigureOptions.cs
index 715b2ce..f0e161b 100644
--- a/src/Infrastructure/Security/JwtBearerOptionsPostConfigureOptions.cs
+++ b/src/Infrastructure/Security/JwtBearerOptionsPostConfigureOptions.cs
@@ -4,7 +4,7 @@ namespace Infrastructure.Security;
 
 public class JwtBearerOptionsPostConfigureOptions(
     DefaultTokenHandler tokenHandler,
-    ITokenBuilder<long> tokenBuilder)
+    ITokenBuilder tokenBuilder)
     : IPostConfigureOptions<JwtBearerOptions>
 {
     public void PostConfigure(string? name, JwtBearerOptions options)