diff --git a/DotBased.AspNet.Authority/Managers/AuthorityManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityManager.cs
index 4b78e03..50548b1 100644
--- a/DotBased.AspNet.Authority/Managers/AuthorityManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityManager.cs
@@ -16,6 +16,7 @@ public partial class AuthorityManager
         IServiceProvider services,
         ICryptographer cryptographer,
         IUserRepository userRepository,
+        IRoleRepository roleRepository,
         IPasswordHasher passwordHasher)
     {
         _logger = LogService.RegisterLogger<AuthorityManager>();
@@ -23,6 +24,7 @@ public partial class AuthorityManager
         Services = services;
         Cryptographer = cryptographer;
         UserRepository = userRepository;
+        RoleRepository = roleRepository;
         PasswordHasher = passwordHasher;
     }
 
@@ -33,6 +35,7 @@ public partial class AuthorityManager
     public ICryptographer Cryptographer { get; }
     
     public IUserRepository UserRepository { get; }
+    public IRoleRepository RoleRepository { get; }
     
     public IPasswordHasher PasswordHasher { get; }
     
diff --git a/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs
index 22e70cb..3500cb4 100644
--- a/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs
@@ -1,6 +1,26 @@
+using DotBased.AspNet.Authority.Models.Authority;
+
 namespace DotBased.AspNet.Authority.Managers;
 
 public partial class AuthorityManager
 {
-    
+    public async Task<Result<AuthorityRole>> CreateRoleAsync(AuthorityRole role, CancellationToken? cancellationToken = null)
+    {
+        return Result<AuthorityRole>.Failed("Not implemented!");
+    }
+
+    public async Task<Result> DeleteRoleAsync(AuthorityRole role, CancellationToken? cancellationToken = null)
+    {
+        return Result.Failed("Not implemented!");
+    }
+
+    public async Task<Result<AuthorityRole>> UpdateRoleAsync(AuthorityRole role, CancellationToken? cancellationToken = null)
+    {
+        return Result<AuthorityRole>.Failed("Not implemented!");
+    }
+
+    public async Task AddUserToRole(AuthorityUser user, AuthorityRole role, CancellationToken? cancellationToken = null)
+    {
+        
+    }
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs
index 94feb6f..5b07cfc 100644
--- a/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs
@@ -34,13 +34,13 @@ public partial class AuthorityManager
         return errors.Count > 0 ? ValidationResult.Failed(errors) : ValidationResult.Ok();
     }
 
-    public async Task<ListResult<AuthorityUser>> SearchUsersAsync(string query, int maxResults = 20, int offset = 0)
+    public async Task<ListResult<AuthorityUser>> SearchUsersAsync(string query, int maxResults = 20, int offset = 0, CancellationToken? cancellationToken = null)
     {
-        var searchResult = await UserRepository.GetAuthorityUsersAsync(query, maxResults, offset);
+        var searchResult = await UserRepository.GetAuthorityUsersAsync(query, maxResults, offset, cancellationToken);
         return searchResult.Item1 == null ? ListResult<AuthorityUser>.Failed("No results!") : ListResult<AuthorityUser>.Ok(searchResult.Item1, searchResult.Item2);
     }
 
-    public async Task<AuthorityResult<AuthorityUser>> UpdatePasswordAsync(AuthorityUser user, string password)
+    public async Task<AuthorityResult<AuthorityUser>> UpdatePasswordAsync(AuthorityUser user, string password, CancellationToken? cancellationToken = null)
     {
         var passwordValidation = await ValidatePasswordAsync(user, password);
         if (!passwordValidation.Success)
@@ -53,11 +53,11 @@ public partial class AuthorityManager
         user.PasswordHash = await PasswordHasher.HashPasswordAsync(password);
         user.SecurityVersion = GenerateVersion();
 
-        var updateResult = await UserRepository.UpdateUserAsync(user);
+        var updateResult = await UserRepository.UpdateUserAsync(user, cancellationToken);
         return updateResult == null ? AuthorityResult<AuthorityUser>.Error("Failed to save updates!") : AuthorityResult<AuthorityUser>.Ok(updateResult);
     }
 
-    public async Task<AuthorityResult<AuthorityUser>> CreateUserAsync(AuthorityUser userModel, string password)
+    public async Task<AuthorityResult<AuthorityUser>> CreateUserAsync(AuthorityUser userModel, string password, CancellationToken? cancellationToken = null)
     {
         var userValidation = await ValidateUserAsync(userModel);
         var passwordValidation = await ValidatePasswordAsync(userModel, password);
@@ -74,22 +74,22 @@ public partial class AuthorityManager
         var hashedPassword = await PasswordHasher.HashPasswordAsync(password);
         userModel.PasswordHash = hashedPassword;
 
-        var userCreationResult = await UserRepository.CreateUserAsync(userModel);
+        var userCreationResult = await UserRepository.CreateUserAsync(userModel, cancellationToken);
 
         return userCreationResult != null
             ? AuthorityResult<AuthorityUser>.Ok(userCreationResult)
             : AuthorityResult<AuthorityUser>.Error("Failed to create user in repository!");
     }
 
-    public async Task<Result<AuthorityUser>> UpdateUserAsync(AuthorityUser model)
+    public async Task<Result<AuthorityUser>> UpdateUserAsync(AuthorityUser model, CancellationToken? cancellationToken = null)
     {
-        var updateResult = await UserRepository.UpdateUserAsync(model);
+        var updateResult = await UserRepository.UpdateUserAsync(model, cancellationToken);
         return updateResult != null ? Result<AuthorityUser>.Ok(updateResult) : Result<AuthorityUser>.Failed("Failed to update user in repository!");
     }
 
-    public async Task<bool> DeleteUserAsync(AuthorityUser model)
+    public async Task<bool> DeleteUserAsync(AuthorityUser model, CancellationToken? cancellationToken = null)
     {
-        var deleteResult = await UserRepository.DeleteUserAsync(model);
+        var deleteResult = await UserRepository.DeleteUserAsync(model, cancellationToken);
         return deleteResult;
     }
     
diff --git a/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs b/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs
index 90ccee5..4fc2600 100644
--- a/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs
+++ b/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs
@@ -1,22 +1,8 @@
 namespace DotBased.AspNet.Authority.Models.Authority;
 
-public class AuthorityRole : AuthorityRole<Guid>
+public abstract class AuthorityRole
 {
-    public AuthorityRole(string name) : this()
-    {
-        Name = name;
-    }
-    
-    public AuthorityRole()
-    {
-        Id = Guid.NewGuid();
-        CreatedDate = DateTime.Now;
-    }
-}
-
-public abstract class AuthorityRole<TKey> where TKey : IEquatable<TKey>
-{
-    public TKey Id { get; set; }
+    public Guid Id { get; set; }
     
     public string? Name { get; set; }