diff --git a/DotBased.AspNet.Authority.EFCore/AuthorityContext.cs b/DotBased.AspNet.Authority.EFCore/AuthorityContext.cs
index 57dbaa8..92a21c3 100644
--- a/DotBased.AspNet.Authority.EFCore/AuthorityContext.cs
+++ b/DotBased.AspNet.Authority.EFCore/AuthorityContext.cs
@@ -11,54 +11,47 @@ public class AuthorityContext(DbContextOptions<AuthorityContext> options) : DbCo
     public DbSet<AuthorityRole> Roles { get; set; }
     public DbSet<AuthorityUser> Users { get; set; }
     
-    public DbSet<RoleGroup> RoleGroup { get; set; }
-    public DbSet<RoleUser> RoleUser { get; set; }
-    public DbSet<UserGroup> UserGroup { get; set; }
+    public DbSet<RoleLink> RoleLinks { get; set; }
+    public DbSet<UserGroups> UserGroups { get; set; }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.Entity<AuthorityAttribute>(attributeEntity =>
         {
             attributeEntity.ToTable("authority_attributes");
-            attributeEntity.HasKey(a => new { a.BoundId, a.AttributeKey });
+            attributeEntity.HasKey(a => new { a.ForeignKey, a.AttributeKey });
         });
 
         modelBuilder.Entity<AuthorityGroup>(groupEntity =>
         {
             groupEntity.ToTable("authority_groups");
             groupEntity.HasKey(x => x.Id);
-            groupEntity.HasMany(g => g.Attributes).WithOne().HasForeignKey(a => a.BoundId).OnDelete(DeleteBehavior.Cascade);
+            groupEntity.HasMany(g => g.Attributes).WithOne().HasForeignKey(a => a.ForeignKey).OnDelete(DeleteBehavior.Cascade);
         });
 
         modelBuilder.Entity<AuthorityRole>(roleEntity =>
         {
             roleEntity.ToTable("authority_roles");
             roleEntity.HasKey(x => x.Id);
-            roleEntity.HasMany(r => r.Attributes).WithOne().HasForeignKey(a => a.BoundId).OnDelete(DeleteBehavior.Cascade);
+            roleEntity.HasMany(r => r.Attributes).WithOne().HasForeignKey(a => a.ForeignKey).OnDelete(DeleteBehavior.Cascade);
         });
         
         modelBuilder.Entity<AuthorityUser>(userEntity =>
         {
             userEntity.ToTable("authority_users");
             userEntity.HasKey(x => x.Id);
-            userEntity.HasMany(u => u.Attributes).WithOne().HasForeignKey(a => a.BoundId).OnDelete(DeleteBehavior.Cascade);
+            userEntity.HasMany(u => u.Attributes).WithOne().HasForeignKey(a => a.ForeignKey).OnDelete(DeleteBehavior.Cascade);
         });
 
-        modelBuilder.Entity<RoleGroup>(rgEntity =>
+        modelBuilder.Entity<RoleLink>(rgEntity =>
         {
-            rgEntity.ToTable("role_group");
-            rgEntity.HasKey(rg => new { rg.RoleId, rg.GroupId });
+            rgEntity.ToTable("role_links");
+            rgEntity.HasKey(rg => new { rg.RoleId, rg.LinkId });
         });
 
-        modelBuilder.Entity<RoleUser>(ruEntity =>
+        modelBuilder.Entity<UserGroups>(ugEntity =>
         {
-            ruEntity.ToTable("role_user");
-            ruEntity.HasKey(ru => new { ru.RoleId, ru.UserId });
-        });
-
-        modelBuilder.Entity<UserGroup>(ugEntity =>
-        {
-            ugEntity.ToTable("user_group");
+            ugEntity.ToTable("user_groups");
             ugEntity.HasKey(ug => new { ug.UserId, ug.GroupId });
         });
         
diff --git a/DotBased.AspNet.Authority.EFCore/Models/RoleGroup.cs b/DotBased.AspNet.Authority.EFCore/Models/RoleLink.cs
similarity index 59%
rename from DotBased.AspNet.Authority.EFCore/Models/RoleGroup.cs
rename to DotBased.AspNet.Authority.EFCore/Models/RoleLink.cs
index 1afe9a7..19fd75d 100644
--- a/DotBased.AspNet.Authority.EFCore/Models/RoleGroup.cs
+++ b/DotBased.AspNet.Authority.EFCore/Models/RoleLink.cs
@@ -1,7 +1,7 @@
 namespace DotBased.AspNet.Authority.EFCore.Models;
 
-public class RoleGroup
+public class RoleLink
 {
     public Guid RoleId { get; set; }
-    public Guid GroupId { get; set; }
+    public Guid LinkId { get; set; }
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority.EFCore/Models/UserGroup.cs b/DotBased.AspNet.Authority.EFCore/Models/UserGroups.cs
similarity index 83%
rename from DotBased.AspNet.Authority.EFCore/Models/UserGroup.cs
rename to DotBased.AspNet.Authority.EFCore/Models/UserGroups.cs
index 648b376..beea497 100644
--- a/DotBased.AspNet.Authority.EFCore/Models/UserGroup.cs
+++ b/DotBased.AspNet.Authority.EFCore/Models/UserGroups.cs
@@ -1,6 +1,6 @@
 namespace DotBased.AspNet.Authority.EFCore.Models;
 
-public class UserGroup
+public class UserGroups
 {
     public Guid UserId { get; set; }
     public Guid GroupId { get; set; }
diff --git a/DotBased.AspNet.Authority.EFCore/Models/RoleUser.cs b/DotBased.AspNet.Authority.EFCore/Models/UserRoles.cs
similarity index 84%
rename from DotBased.AspNet.Authority.EFCore/Models/RoleUser.cs
rename to DotBased.AspNet.Authority.EFCore/Models/UserRoles.cs
index c4a0917..b7a657b 100644
--- a/DotBased.AspNet.Authority.EFCore/Models/RoleUser.cs
+++ b/DotBased.AspNet.Authority.EFCore/Models/UserRoles.cs
@@ -1,6 +1,6 @@
 namespace DotBased.AspNet.Authority.EFCore.Models;
 
-public class RoleUser
+public class UserRoles
 {
     public Guid RoleId { get; set; }
     public Guid UserId { get; set; }
diff --git a/DotBased.AspNet.Authority.EFCore/Repositories/AttributeRepository.cs b/DotBased.AspNet.Authority.EFCore/Repositories/AttributeRepository.cs
index b986ccc..959d10f 100644
--- a/DotBased.AspNet.Authority.EFCore/Repositories/AttributeRepository.cs
+++ b/DotBased.AspNet.Authority.EFCore/Repositories/AttributeRepository.cs
@@ -15,13 +15,13 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
             var query = context.Attributes.AsQueryable();
             if (!string.IsNullOrEmpty(search))
             {
-                query = query.Where(a => $"{a.AttributeKey} {a.BoundId} {a.AttributeValue}".Contains(search, StringComparison.CurrentCultureIgnoreCase));
+                query = query.Where(a => $"{a.AttributeKey} {a.ForeignKey} {a.AttributeValue}".Contains(search, StringComparison.CurrentCultureIgnoreCase));
             }
             
             var total = await query.CountAsync(cancellationToken);
             var select = await query.OrderBy(a => a.AttributeKey).Skip(offset).Take(limit).Select(a => new AuthorityAttributeItem()
             {
-                BoundId = a.BoundId,
+                BoundId = a.ForeignKey,
                 AttributeKey = a.AttributeKey,
                 AttributeValue = a.AttributeValue
             }).ToListAsync(cancellationToken);
@@ -52,7 +52,7 @@ public class AttributeRepository(IDbContextFactory<AuthorityContext> contextFact
         try
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-            if (string.IsNullOrWhiteSpace(attribute.AttributeKey) || attribute.BoundId == Guid.Empty)
+            if (string.IsNullOrWhiteSpace(attribute.AttributeKey) || attribute.ForeignKey == Guid.Empty)
             {
                 return Result<AuthorityAttribute>.Failed("Attribute key and/or bound id is empty");
             }
diff --git a/DotBased.AspNet.Authority.EFCore/Repositories/GroupRepository.cs b/DotBased.AspNet.Authority.EFCore/Repositories/GroupRepository.cs
index 212ed61..3dce771 100644
--- a/DotBased.AspNet.Authority.EFCore/Repositories/GroupRepository.cs
+++ b/DotBased.AspNet.Authority.EFCore/Repositories/GroupRepository.cs
@@ -48,6 +48,21 @@ public class GroupRepository(IDbContextFactory<AuthorityContext> contextFactory)
         }
     }
 
+    public async Task<ListResult<AuthorityGroup>> GetUserGroupsAsync(AuthorityUser user, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            var userJoinGroups = context.UserGroups.Where(ug => ug.UserId == user.Id).Select(ug => ug.GroupId);
+            var userGroups = context.Groups.Where(g => userJoinGroups.Contains(g.Id));
+            return ListResult<AuthorityGroup>.Ok(userGroups, userGroups.Count());
+        }
+        catch (Exception e)
+        {
+            return HandleExceptionListResult<AuthorityGroup>("Failed to get Groups", e);
+        }
+    }
+
     public async Task<Result<AuthorityGroup>> CreateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default)
     {
         try
diff --git a/DotBased.AspNet.Authority.EFCore/Repositories/RoleRepository.cs b/DotBased.AspNet.Authority.EFCore/Repositories/RoleRepository.cs
index 3b8824a..e6f4d92 100644
--- a/DotBased.AspNet.Authority.EFCore/Repositories/RoleRepository.cs
+++ b/DotBased.AspNet.Authority.EFCore/Repositories/RoleRepository.cs
@@ -1,9 +1,11 @@
+using DotBased.AspNet.Authority.EFCore.Models;
 using DotBased.AspNet.Authority.Models.Authority;
 using DotBased.AspNet.Authority.Repositories;
 using Microsoft.EntityFrameworkCore;
 
 namespace DotBased.AspNet.Authority.EFCore.Repositories;
 
+
 public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory) : RepositoryBase, IRoleRepository
 {
     public async Task<ListResult<AuthorityRoleItem>> GetRolesAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
@@ -95,19 +97,18 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
         }
     }
 
-    public async Task<Result> DeleteRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default)
+    public async Task<Result> DeleteRolesAsync(List<AuthorityRole> roles, CancellationToken cancellationToken = default)
     {
         try
         {
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
-            var currentRole = await context.Roles.FirstOrDefaultAsync(r => r.Id == role.Id, cancellationToken: cancellationToken);
-            if (currentRole == null)
-            {
-                return Result.Failed("Role not found, could not delete!");
-            }
-            context.Roles.Remove(currentRole);
+            var roleIds = roles.Select(r => r.Id).ToList();
+            
+            context.Roles.RemoveRange(roles);
+            context.RoleLinks.RemoveRange(context.RoleLinks.Where(rg => roleIds.Contains(rg.RoleId)));
+            
             var saveResult = await context.SaveChangesAsync(cancellationToken);
-            return saveResult <= 0 ? Result.Failed("Failed to delete role!") : Result.Ok();
+            return saveResult <= 0 ? Result.Failed("Failed to delete roles!") : Result.Ok();
         }
         catch (Exception e)
         {
@@ -117,6 +118,89 @@ public class RoleRepository(IDbContextFactory<AuthorityContext> contextFactory)
 
     public async Task<ListResult<AuthorityRoleItem>> GetUserRolesAsync(AuthorityUser user, int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
     {
-        return ListResult<AuthorityRoleItem>.Failed("Not implemented!");
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            var roleIds = await context.RoleLinks.Where(r => r.LinkId == user.Id).Select(i => i.RoleId).ToListAsync(cancellationToken: cancellationToken);
+            var rolesQuery = context.Roles.Where(r => roleIds.Contains(r.Id));
+            if (!string.IsNullOrEmpty(search))
+            {
+                rolesQuery = rolesQuery.Where(r => r.Name.Contains(search));
+            }
+
+            var roles = rolesQuery.Where(r => roleIds.Contains(r.Id)).Skip(offset).Take(limit).Select(r => new AuthorityRoleItem()
+            {
+                Id = r.Id,
+                Name = r.Name
+            });
+            return ListResult<AuthorityRoleItem>.Ok(roles, limit, offset);
+        }
+        catch (Exception e)
+        {
+            return HandleExceptionListResult<AuthorityRoleItem>("Failed to get user roles.", e);
+        }
+    }
+
+    public async Task<Result> AddRolesLinkAsync(List<AuthorityRole> roles, Guid linkId, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            foreach (var role in roles)
+            {
+                context.RoleLinks.Add(new RoleLink() { LinkId = linkId, RoleId = role.Id });
+            }
+            var saveResult = await context.SaveChangesAsync(cancellationToken);
+            return saveResult <= 0 ? Result.Failed("Failed to ad role link!") : Result.Ok();
+        }
+        catch (Exception e)
+        {
+            return HandleException("Failed to add role link!", e);
+        }
+    }
+
+    public async Task<ListResult<AuthorityRole>> GetLinkedRolesAsync(List<Guid> linkIds, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            var linkedRoles = context.RoleLinks.Where(r => linkIds.Contains(r.LinkId)).Select(r => r.RoleId);
+            var roleList = await context.Roles.Where(r => linkedRoles.Contains(r.Id)).ToListAsync(cancellationToken);
+            return ListResult<AuthorityRole>.Ok(roleList.DistinctBy(r => r.Id));
+        }
+        catch (Exception e)
+        {
+            return HandleExceptionListResult<AuthorityRole>("Failed to get linked roles!", e);
+        }
+    }
+
+    public async Task<Result> DeleteRolesLinkAsync(List<AuthorityRole> roles, Guid linkId, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            var roleIds = roles.Select(r => r.Id).ToList();
+            context.RoleLinks.RemoveRange(context.RoleLinks.Where(rg => rg.LinkId == linkId && roleIds.Contains(rg.RoleId)));
+            var saveResult = await context.SaveChangesAsync(cancellationToken);
+            return saveResult <= 0 ? Result.Failed("Failed to delete role links!") : Result.Ok();
+        }
+        catch (Exception e)
+        {
+            return HandleException("Failed to delete role link!", e);
+        }
+    }
+
+    public async Task<ListResult<Guid>> HasRolesAsync(Guid linkId, List<AuthorityRole> roles, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+            var hasRoles = await context.RoleLinks.Where(r => r.LinkId == linkId && roles.Any(ar => ar.Id == r.RoleId)).Select(r => r.RoleId).ToListAsync(cancellationToken);
+            return ListResult<Guid>.Ok(hasRoles);
+        }
+        catch (Exception e)
+        {
+            return HandleExceptionListResult<Guid>("Failed to determine role for user!", e);
+        }
     }
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority/Managers/AuthorityGroupManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityGroupManager.cs
index 517a836..0dc7bf4 100755
--- a/DotBased.AspNet.Authority/Managers/AuthorityGroupManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityGroupManager.cs
@@ -4,8 +4,8 @@ namespace DotBased.AspNet.Authority.Managers;
 
 public partial class AuthorityManager
 {
-    public async Task<ListResult<AuthorityGroupItem>> GetUserGroupsAsync(AuthorityUser user, CancellationToken cancellationToken = default)
+    public async Task<ListResult<AuthorityGroup>> GetUserGroupsAsync(AuthorityUser user, CancellationToken cancellationToken = default)
     {
-        return ListResult<AuthorityGroupItem>.Failed("Not implemented!");
+        return await GroupRepository.GetUserGroupsAsync(user, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority/Managers/AuthorityManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityManager.cs
index a9f83f9..fc048da 100755
--- a/DotBased.AspNet.Authority/Managers/AuthorityManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityManager.cs
@@ -14,6 +14,7 @@ public partial class AuthorityManager(
     IServiceProvider services,
     ICryptographer cryptographer,
     IUserRepository userRepository,
+    IGroupRepository groupRepository,
     IRoleRepository roleRepository,
     IPasswordHasher passwordHasher)
 {
@@ -24,6 +25,7 @@ public partial class AuthorityManager(
     public ICryptographer Cryptographer { get; } = cryptographer;
 
     public IUserRepository UserRepository { get; } = userRepository;
+    public IGroupRepository GroupRepository { get; } = groupRepository;
     public IRoleRepository RoleRepository { get; } = roleRepository;
 
     public IPasswordHasher PasswordHasher { get; } = passwordHasher;
diff --git a/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs
index e63059b..60332c2 100755
--- a/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityRoleManager.cs
@@ -8,43 +8,103 @@ public partial class AuthorityManager
     public async Task<AuthorityResult<AuthorityRole>> CreateRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default)
     {
         role.Version = GenerateVersion();
-        var createResult = await roleRepository.CreateRoleAsync(role, cancellationToken);
+        var createResult = await RoleRepository.CreateRoleAsync(role, cancellationToken);
         return AuthorityResult<AuthorityRole>.FromResult(createResult);
     }
 
-    public async Task<Result> DeleteRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default)
+    public async Task<Result> DeleteRolesAsync(List<AuthorityRole> roles, CancellationToken cancellationToken = default)
     {
-        var result = await roleRepository.DeleteRoleAsync(role, cancellationToken);
+        var result = await RoleRepository.DeleteRolesAsync(roles, cancellationToken);
         return result;
     }
 
     public async Task<Result<AuthorityRole>> UpdateRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default)
     {
-        var result = await roleRepository.UpdateRoleAsync(role, cancellationToken);
+        var result = await RoleRepository.UpdateRoleAsync(role, cancellationToken);
         return result;
     }
 
     public async Task<ListResult<AuthorityRoleItem>> GetRolesAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default)
     {
-        var searchResult = await roleRepository.GetRolesAsync(limit, offset, search, cancellationToken);
+        var searchResult = await RoleRepository.GetRolesAsync(limit, offset, search, cancellationToken);
         return searchResult;
     }
 
-    public async Task AddRoleToUserAsync(AuthorityUser user, AuthorityRole role, CancellationToken cancellationToken = default)
+    public async Task AddRolesToUserAsync(List<AuthorityRole> roles, AuthorityUser user, CancellationToken cancellationToken = default)
     {
-        /*
-            - Validate User & Role
-            - Check if role is already in linked to user (if user already has the role, return)
-            - Add to UsersRoles table
-        */
+        var usrValidation = await IsValidUserAsync(user, cancellationToken);
+        if (!usrValidation.Success)
+        {
+            _logger.Error(usrValidation.Exception ?? new Exception("Validation for user failed!"), "Invalid user!");
+            return;
+        }
+        
+        var checkResult = await RoleRepository.HasRolesAsync(user.Id, roles, cancellationToken);
+        if (!checkResult.Success)
+        {
+            return;
+        }
+
+        var rolesToAdd = roles;
+        if (checkResult.Count != 0)
+        {
+            rolesToAdd = roles.Where(r => !checkResult.Items.Contains(r.Id)).ToList();
+        }
+
+        var addResult = await RoleRepository.AddRolesLinkAsync(rolesToAdd, user.Id, cancellationToken);
+        if (!addResult.Success)
+        {
+            _logger.Error(addResult.Exception ?? new Exception("Adding role to user failed!, No further information available!"),"Failed to add role to user!");
+        }
     }
 
-    public async Task RemoveRoleFromUserAsync(AuthorityRole role, AuthorityUser user, CancellationToken cancellationToken = default)
+    public async Task RemoveRolesFromUserAsync(List<AuthorityRole> roles, AuthorityUser user, CancellationToken cancellationToken = default)
     {
+        var usrValidation = await IsValidUserAsync(user, cancellationToken);
+        if (!usrValidation.Success)
+        {
+            _logger.Error(usrValidation.Exception ?? new Exception("Validation for user failed!"), "Invalid user!");
+            return;
+        }
+        
+        var checkResult = await RoleRepository.HasRolesAsync(user.Id, roles, cancellationToken);
+        if (!checkResult.Success)
+        {
+            return;
+        }
+
+        var rolesToRemove = roles;
+        if (checkResult.Count != 0)
+        {
+            rolesToRemove = roles.Where(r => !checkResult.Items.Contains(r.Id)).ToList();
+        }
+        
+        var removeResult = await RoleRepository.DeleteRolesLinkAsync(rolesToRemove, user.Id, cancellationToken);
+        if (!removeResult.Success)
+        {
+            _logger.Error(removeResult.Exception ?? new Exception("Removing roles from user failed!"), "Failed to remove roles from user!");
+        }
     }
 
-    public async Task AddRoleToGroupAsync(AuthorityRole role, AuthorityGroup group, CancellationToken cancellationToken = default)
+    public async Task AddRolesToGroupAsync(List<AuthorityRole> roles, AuthorityGroup group, CancellationToken cancellationToken = default)
     {
+        var checkResult = await RoleRepository.HasRolesAsync(group.Id, roles, cancellationToken);
+        if (!checkResult.Success)
+        {
+            return;
+        }
+        
+        var rolesToAdd = roles;
+        if (checkResult.Count != 0)
+        {
+            rolesToAdd = roles.Where(r => !checkResult.Items.Contains(r.Id)).ToList();
+        }
+        
+        var addResult = await RoleRepository.AddRolesLinkAsync(rolesToAdd, group.Id, cancellationToken);
+        if (!addResult.Success)
+        {
+            _logger.Error(addResult.Exception ?? new Exception("Adding roles to group failed!"), "Failed to add roles to group!");
+        }
     }
 
     /// <summary>
@@ -60,26 +120,19 @@ public partial class AuthorityManager
             return ListResult<AuthorityRole>.Failed("Invalid user");
         }
         
-        List<AuthorityRole> roles = [];
-        var usrRoles = await GetUserRolesAsync(user, cancellationToken);
-        if (usrRoles.Success)
-        {
-            roles.AddRange(usrRoles.Items);
-        }
+        var searchIds = new List<Guid> { user.Id };
+        
         var usrGroups = await GetUserGroupsAsync(user, cancellationToken);
         if (usrGroups.Success)
         {
-            var groupRolesResult = await GetGroupRolesAsync(usrGroups.Items.Select(g => g.Id).ToList(), cancellationToken);
-            if (groupRolesResult.Success)
-            {
-                roles.AddRange(groupRolesResult.Items);
-            }
+            searchIds.AddRange(usrGroups.Items.Select(g => g.Id).ToList());
         }
-        return ListResult<AuthorityRole>.Ok(roles, roles.Count);
+        
+        return await RoleRepository.GetLinkedRolesAsync(searchIds, cancellationToken);
     }
 
     public async Task<ListResult<AuthorityRole>> GetGroupRolesAsync(List<Guid> groupIds, CancellationToken cancellationToken = default)
     {
-        return ListResult<AuthorityRole>.Failed("Not implemented!");
+        return await RoleRepository.GetLinkedRolesAsync(groupIds, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs b/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs
index cfb7d9c..88462fa 100755
--- a/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs
+++ b/DotBased.AspNet.Authority/Managers/AuthorityUserManager.cs
@@ -91,7 +91,7 @@ public partial class AuthorityManager
 
     public async Task<Result> IsValidUserAsync(AuthorityUser user, CancellationToken cancellationToken = default)
     {
-        var usrResult = await userRepository.GetVersionAsync(user, cancellationToken);
+        var usrResult = await UserRepository.GetVersionAsync(user, cancellationToken);
         return usrResult;
     }
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority/Models/Authority/AuthorityAttribute.cs b/DotBased.AspNet.Authority/Models/Authority/AuthorityAttribute.cs
index 27c08ca..117d8ff 100755
--- a/DotBased.AspNet.Authority/Models/Authority/AuthorityAttribute.cs
+++ b/DotBased.AspNet.Authority/Models/Authority/AuthorityAttribute.cs
@@ -1,12 +1,8 @@
 namespace DotBased.AspNet.Authority.Models.Authority;
 
-public class AuthorityAttribute(string attributeKey, Guid bound)
+public class AuthorityAttribute(string attributeKey, Guid foreignKey)
 {
-    public AuthorityAttribute() : this(string.Empty, Guid.NewGuid())
-    {
-    }
-
-    public Guid BoundId { get; set; } = bound;
+    public Guid ForeignKey { get; set; } = foreignKey;
     
     public string AttributeKey { get; set; } = attributeKey;
 
diff --git a/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs b/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs
index d3efc45..d8b1edf 100755
--- a/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs
+++ b/DotBased.AspNet.Authority/Models/Authority/AuthorityRole.cs
@@ -9,7 +9,7 @@ public class AuthorityRole()
 
     public Guid Id { get; set; } = Guid.NewGuid();
 
-    public string? Name { get; set; }
+    public string Name { get; set; } = string.Empty;
 
     public long Version { get; set; }
 
@@ -17,5 +17,5 @@ public class AuthorityRole()
 
     public IEnumerable<AuthorityAttribute> Attributes { get; set; } = [];
 
-    public override string ToString() => Name ?? string.Empty;
+    public override string ToString() => Name;
 }
\ No newline at end of file
diff --git a/DotBased.AspNet.Authority/Models/AuthorityResult.cs b/DotBased.AspNet.Authority/Models/AuthorityResult.cs
index d74fcfa..108c6b1 100755
--- a/DotBased.AspNet.Authority/Models/AuthorityResult.cs
+++ b/DotBased.AspNet.Authority/Models/AuthorityResult.cs
@@ -23,7 +23,7 @@ public class AuthorityResult<TResultValue> : Result<TResultValue>
     public IReadOnlyList<ValidationError>? ValidationErrors { get; }
     
 
-    public static AuthorityResult<TResultValue> Ok(TResultValue? value) => new AuthorityResult<TResultValue>(true, value:value);
+    public new static AuthorityResult<TResultValue> Ok(TResultValue? value) => new AuthorityResult<TResultValue>(true, value:value);
 
     public static AuthorityResult<TResultValue> Error(string errorMessage, ResultFailReason reason = ResultFailReason.Error) =>
         new AuthorityResult<TResultValue>(false, errorMessage, reason:reason);
diff --git a/DotBased.AspNet.Authority/Repositories/IGroupRepository.cs b/DotBased.AspNet.Authority/Repositories/IGroupRepository.cs
index 3e8e814..c7f8ae5 100755
--- a/DotBased.AspNet.Authority/Repositories/IGroupRepository.cs
+++ b/DotBased.AspNet.Authority/Repositories/IGroupRepository.cs
@@ -6,6 +6,7 @@ public interface IGroupRepository
 {
     public Task<ListResult<AuthorityGroupItem>> GetGroupsAsync(int limit = 20, int offset = 0, string search = "", CancellationToken cancellationToken = default);
     public Task<Result<AuthorityGroup>> GetGroupByIdAsync(string id, CancellationToken cancellationToken = default);
+    public Task<ListResult<AuthorityGroup>> GetUserGroupsAsync(AuthorityUser user, CancellationToken cancellationToken = default);
     public Task<Result<AuthorityGroup>> CreateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default);
     public Task<Result<AuthorityGroup>> UpdateGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default);
     public Task<Result> DeleteGroupAsync(AuthorityGroup group, CancellationToken cancellationToken = default);
diff --git a/DotBased.AspNet.Authority/Repositories/IRoleRepository.cs b/DotBased.AspNet.Authority/Repositories/IRoleRepository.cs
index 83cec83..3bbb5cb 100755
--- a/DotBased.AspNet.Authority/Repositories/IRoleRepository.cs
+++ b/DotBased.AspNet.Authority/Repositories/IRoleRepository.cs
@@ -8,5 +8,17 @@ public interface IRoleRepository
     public Task<Result<AuthorityRole>> GetRoleByIdAsync(string id, CancellationToken cancellationToken = default);
     public Task<Result<AuthorityRole>> CreateRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default);
     public Task<Result<AuthorityRole>> UpdateRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default);
-    public Task<Result> DeleteRoleAsync(AuthorityRole role, CancellationToken cancellationToken = default);
+    public Task<Result> DeleteRolesAsync(List<AuthorityRole> roles, CancellationToken cancellationToken = default);
+    public Task<Result> AddRolesLinkAsync(List<AuthorityRole> roles, Guid linkId, CancellationToken cancellationToken = default);
+    public Task<ListResult<AuthorityRole>> GetLinkedRolesAsync(List<Guid> linkIds, CancellationToken cancellationToken = default);
+    public Task<Result> DeleteRolesLinkAsync(List<AuthorityRole> roles, Guid linkId, CancellationToken cancellationToken = default);
+    
+    /// <summary>
+    /// Return the role ids the linkId has.
+    /// </summary>
+    /// <param name="linkId"></param>
+    /// <param name="roles"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public Task<ListResult<Guid>> HasRolesAsync(Guid linkId, List<AuthorityRole> roles, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/DotBased/Result.cs b/DotBased/Result.cs
index 4669c28..60a61fa 100755
--- a/DotBased/Result.cs
+++ b/DotBased/Result.cs
@@ -44,7 +44,7 @@ public class Result<TValue> : Result
     public new static Result<TValue> Failed(string message, Exception? exception = null) =>
         new(false, message, default, exception);
 
-    public new static Result<TValue> HandleResult(TValue? value, string failedMessage, Exception? exception = null)
+    public static Result<TValue> HandleResult(TValue? value, string failedMessage, Exception? exception = null)
     {
         return value == null ? Failed(failedMessage, exception) : Ok(value);
     }
@@ -56,6 +56,8 @@ public class ListResult<TItem> : Result
     {
         Items = items != null ? new List<TItem>(items) : new List<TItem>();
         TotalCount = totalCount;
+        Limit = limit;
+        Offset = offset;
     }
 
     public ListResult(Result bObj) : base(bObj)
@@ -85,8 +87,8 @@ public class ListResult<TItem> : Result
     public int Offset { get; }
 
     public static ListResult<TItem> Ok(IEnumerable<TItem> items, int totalCount = -1, int limit = -1, int offset = -1) =>
-        new(true, string.Empty, totalCount, items);
+        new(true, string.Empty, totalCount, items, limit, offset);
 
     public new static ListResult<TItem> Failed(string message, Exception? exception = null) =>
-        new(false, message, -1, null);
+        new(false, message, -1, null, exception: exception);
 }
\ No newline at end of file