diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.css b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.css
index 938afb2..a13671e 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.css
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.css
@@ -1,5 +1,4 @@
 a.navbar-brand {
-  white-space: normal;
   text-align: center;
   word-break: break-all;
 }
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.html
index b5d6f09..41dd348 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.html
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.html
@@ -2,7 +2,7 @@
   <nav class="navbar navbar-expand-lg bg-body-tertiary fs-5">
     <div class="container-fluid">
       <!-- DD Logo -->
-      <a class="light-stroke ms-5" href="https://digitaldata.works/">
+      <a class="logo" href="https://digitaldata.works/">
         <img fetchpriority="high" width="200vw"
           [src]="(isDarkTheme)?'../../assets/img/DD_white.svg':'../../assets/img/digital_data.svg'">
       </a>
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts
index fe64219..0223e4e 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts
@@ -15,7 +15,6 @@ import { TransferService } from '../../services/button/transfer.service';
 import { MatBadgeModule } from '@angular/material/badge';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { FormsModule } from '@angular/forms';
-
 import { MatTooltip, MatTooltipModule } from '@angular/material/tooltip';
 import { MatButtonModule } from '@angular/material/button';
 
diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
index 5641e18..2e62c7f 100644
--- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
+++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.API" Version="1.0.2.1" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
index 9e49a15..eb48bc8 100644
--- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
+++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
@@ -25,8 +25,8 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="DigitalData.Core.Application" Version="1.0.0" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Application" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageReference Include="System.DirectoryServices" Version="7.0.1" />
diff --git a/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj b/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj
index 96b6b2f..28de1f4 100644
--- a/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj
+++ b/DigitalData.UserManager.Domain/DigitalData.UserManager.Domain.csproj
@@ -23,6 +23,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Assets\icon.png">
       <Pack>True</Pack>
diff --git a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
index d3e011c..f6609b1 100644
--- a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
+++ b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DigitalData.UserManager.Domain.Entities
 {
-    public class BaseEntity
+    public class BaseEntity : IUnique<int>
     {
         [Column("GUID")]
         [Key]
diff --git a/DigitalData.UserManager.Domain/Entities/Module.cs b/DigitalData.UserManager.Domain/Entities/Module.cs
index 2428cb8..9fc08f3 100644
--- a/DigitalData.UserManager.Domain/Entities/Module.cs
+++ b/DigitalData.UserManager.Domain/Entities/Module.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DigitalData.UserManager.Domain.Entities
 {
     [Table("TBDD_MODULES", Schema = "dbo")]
-    public class Module
+    public class Module : IUnique<int>
     {
         [Column("GUID")]
         [Key]
diff --git a/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs b/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
index 85c6966..d8c8c42 100644
--- a/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
+++ b/DigitalData.UserManager.Domain/Entities/ModuleOfUser.cs
@@ -1,10 +1,11 @@
-using System.ComponentModel.DataAnnotations;
+using DigitalData.Core.Abstractions;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DigitalData.UserManager.Domain.Entities
 {
     [Table("TBDD_USER_MODULES", Schema = "dbo")]
-    public class ModuleOfUser
+    public class ModuleOfUser : IUnique<int>
     {
         [Column("GUID")]
         [Key]
diff --git a/DigitalData.UserManager.Infrastructure/Contracts/IUserManagerDbContext.cs b/DigitalData.UserManager.Infrastructure/Contracts/IUserManagerDbContext.cs
new file mode 100644
index 0000000..b260359
--- /dev/null
+++ b/DigitalData.UserManager.Infrastructure/Contracts/IUserManagerDbContext.cs
@@ -0,0 +1,20 @@
+using DigitalData.UserManager.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace DigitalData.UserManager.Infrastructure.Contracts
+{
+    public interface IUserManagerDbContext
+    {
+        public DbSet<GroupOfUser> GroupOfUsers { get; }
+
+        public DbSet<Group> Groups { get; }
+
+        public DbSet<ModuleOfUser> ModuleOfUsers { get; }
+
+        public DbSet<Module> Modules { get; }
+
+        public DbSet<User> Users { get; }
+
+        public DbSet<UserRep> UserReps { get; }
+    }
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Infrastructure/DbContextExtensions.cs b/DigitalData.UserManager.Infrastructure/DbContextExtensions.cs
index 942c125..9d8b69e 100644
--- a/DigitalData.UserManager.Infrastructure/DbContextExtensions.cs
+++ b/DigitalData.UserManager.Infrastructure/DbContextExtensions.cs
@@ -32,4 +32,4 @@ namespace DigitalData.UserManager.Infrastructure
             return modelBuilder;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
index 6d9082b..d26b46e 100644
--- a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
+++ b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DigitalData.Core.Infrastructure" Version="1.0.1.1" />
+    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
       <PrivateAssets>all</PrivateAssets>
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs
index f7eda39..60df3b6 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs
@@ -6,9 +6,9 @@ using Microsoft.EntityFrameworkCore;
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
     public class GroupOfUserRepository<TDbContext> : CRUDRepository<GroupOfUser, int, TDbContext>, IGroupOfUserRepository
-        where TDbContext : DbContext
+        where TDbContext : DbContext, IUserManagerDbContext
     {
-        public GroupOfUserRepository(TDbContext dbContext) : base(dbContext)
+        public GroupOfUserRepository(TDbContext dbContext) : base(dbContext, dbContext.GroupOfUsers)
         {
         }
 
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/GroupRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/GroupRepository.cs
index 391942d..38f5468 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/GroupRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/GroupRepository.cs
@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
     public class GroupRepository<TDbContext> : CRUDRepository<Group, int, TDbContext>, IGroupRepository
-        where TDbContext : DbContext
+        where TDbContext : DbContext, IUserManagerDbContext
     {
-        public GroupRepository(TDbContext dbContext) : base(dbContext)
+        public GroupRepository(TDbContext dbContext) : base(dbContext, dbContext.Groups)
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/ModuleOfUserRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/ModuleOfUserRepository.cs
index f5995af..30175be 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/ModuleOfUserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/ModuleOfUserRepository.cs
@@ -6,9 +6,9 @@ using Microsoft.EntityFrameworkCore;
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
     public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
-        where TDbContext : DbContext
+        where TDbContext : DbContext, IUserManagerDbContext
     {
-        public ModuleOfUserRepository(TDbContext dbContext) : base(dbContext)
+        public ModuleOfUserRepository(TDbContext dbContext) : base(dbContext, dbContext.ModuleOfUsers)
         {
         }
 
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs
index 885a077..6fb88f1 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs
@@ -6,10 +6,10 @@ using Microsoft.EntityFrameworkCore;
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
     public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
-        where TDbContext : DbContext
+        where TDbContext : DbContext, IUserManagerDbContext
     {
-        public ModuleRepository(TDbContext dbContext) : base(dbContext)
+        public ModuleRepository(TDbContext dbContext) : base(dbContext, dbContext.Modules)
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs
index 5d1a28a..3b598ed 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/UserRepRepository.cs
@@ -6,9 +6,9 @@ using Microsoft.EntityFrameworkCore;
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
     public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
-        where TDbContext : DbContext
+        where TDbContext : DbContext, IUserManagerDbContext
     {
-        public UserRepRepository(TDbContext dbContext) : base(dbContext)
+        public UserRepRepository(TDbContext dbContext) : base(dbContext, dbContext.UserReps)
         {
         }
 
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/UserRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/UserRepository.cs
index 9e916b9..09f5f27 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/UserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/UserRepository.cs
@@ -6,11 +6,11 @@ using Microsoft.EntityFrameworkCore;
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
     public class UserRepository<TDbContext> : CRUDRepository<User, int, TDbContext>, IUserRepository
-        where TDbContext : DbContext
+        where TDbContext : DbContext, IUserManagerDbContext
     {
         private IModuleOfUserRepository _moduleOfUserRepo;
         private IGroupOfUserRepository _groupOfUserRepo;
-        public UserRepository(TDbContext dbContext, IModuleOfUserRepository moduleOfUserRepo, IGroupOfUserRepository groupOfUserRepo) : base(dbContext)
+        public UserRepository(TDbContext dbContext, IModuleOfUserRepository moduleOfUserRepo, IGroupOfUserRepository groupOfUserRepo) : base(dbContext, dbContext.Users)
         {
             _moduleOfUserRepo = moduleOfUserRepo;
             _groupOfUserRepo = groupOfUserRepo;
diff --git a/DigitalData.UserManager.Infrastructure/UserManagerDbContext.cs b/DigitalData.UserManager.Infrastructure/UserManagerDbContext.cs
index 0c28fb8..b7c4ec2 100644
--- a/DigitalData.UserManager.Infrastructure/UserManagerDbContext.cs
+++ b/DigitalData.UserManager.Infrastructure/UserManagerDbContext.cs
@@ -1,11 +1,31 @@
-using Microsoft.EntityFrameworkCore;
+using DigitalData.UserManager.Domain.Entities;
+using DigitalData.UserManager.Infrastructure.Contracts;
+using Microsoft.EntityFrameworkCore;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
-    public class UserManagerDbContext : DbContext
+    public class UserManagerDbContext : DbContext, IUserManagerDbContext
     {
+        public DbSet<GroupOfUser> GroupOfUsers { get; set; }
+
+        public DbSet<Group> Groups { get; set; }
+
+        public DbSet<ModuleOfUser> ModuleOfUsers { get; set; }
+
+        public DbSet<Module> Modules { get; set; }
+
+        public DbSet<User> Users { get; set; }
+
+        public DbSet<UserRep> UserReps { get; set; }
+
         public UserManagerDbContext(DbContextOptions<UserManagerDbContext> options) : base(options)
         {
+            GroupOfUsers = Set<GroupOfUser>();
+            Groups = Set<Group>();
+            ModuleOfUsers = Set<ModuleOfUser>();
+            Modules = Set<Module>();
+            Users = Set<User>();
+            UserReps = Set<UserRep>();
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)