diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
index 82051684..877dfec9 100644
--- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
@@ -1,11 +1,15 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
+using DigitalData.UserManager.Domain.Entities;
 using DigitalData.UserManager.Infrastructure;
+using DigitalData.UserManager.Infrastructure.Contracts;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
+using Group = DigitalData.UserManager.Domain.Entities.Group;
+using Module = DigitalData.UserManager.Domain.Entities.Module;
 
 namespace EnvelopeGenerator.Infrastructure
 {
-    public class EGDbContext : DbContext
+    public class EGDbContext : DbContext, IUserManagerDbContext
     {
         public DbSet<UserReceiver> UserReceivers { get; set; }
 
@@ -31,6 +35,18 @@ namespace EnvelopeGenerator.Infrastructure
 
         public DbSet<Receiver> Receivers { get; set; }
 
+        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 EGDbContext(DbContextOptions<EGDbContext> options) : base(options)
         {
             UserReceivers = Set<UserReceiver>();
@@ -44,6 +60,13 @@ namespace EnvelopeGenerator.Infrastructure
             EnvelopeHistories = Set<EnvelopeHistory>();
             EnvelopeTypes = Set<EnvelopeType>();
             Receivers = Set<Receiver>();
+
+            GroupOfUsers = Set<GroupOfUser>();
+            Groups = Set<Group>();
+            ModuleOfUsers = Set<ModuleOfUser>();
+            Modules = Set<Module>();
+            Users = Set<User>();
+            UserReps = Set<UserRep>();
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
index 8bed176f..53958473 100644
--- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
+++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj
@@ -38,9 +38,9 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="BuildBundlerMinifier2022" Version="2.9.9" />
-    <PackageReference Include="DigitalData.Core.Abstractions" Version="1.0.1.1" />
-    <PackageReference Include="DigitalData.Core.API" Version="1.0.2.1" />
-    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.Abstractions" Version="2.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.0.0" />
+    <PackageReference Include="DigitalData.EmailProfilerDispatcher" Version="2.0.0" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.865" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" />
@@ -64,7 +64,7 @@
     <PackageReference Include="System.DirectoryServices.Protocols" Version="7.0.1" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-    <PackageReference Include="UserManager.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>