diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
index c0f13aa8..82051684 100644
--- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
@@ -15,12 +15,35 @@ namespace EnvelopeGenerator.Infrastructure
 
         public DbSet<Envelope> Envelopes { get; set; }
 
+        public DbSet<DocumentReceiverElement> DocumentReceiverElements { get; set; }
+
+        public DbSet<DocumentStatus> DocumentStatus { get; set; }
+
+        public DbSet<EmailTemplate> EmailTemplate { get; set; }
+
+        public DbSet<EnvelopeCertificate> EnvelopeCertificates { get; set; }
+
+        public DbSet<EnvelopeDocument> EnvelopeDocument { get; set; }
+
+        public DbSet<EnvelopeHistory> EnvelopeHistories { get; set; }
+
+        public DbSet<EnvelopeType> EnvelopeTypes { get; set; }
+
+        public DbSet<Receiver> Receivers { get; set; }
+
         public EGDbContext(DbContextOptions<EGDbContext> options) : base(options)
         {
             UserReceivers = Set<UserReceiver>();
             Configs = Set<Config>();
             EnvelopeReceivers = Set<EnvelopeReceiver>();
             Envelopes = Set<Envelope>();
+            DocumentReceiverElements = Set<DocumentReceiverElement>();
+            DocumentStatus = Set<DocumentStatus>();
+            EnvelopeCertificates = Set<EnvelopeCertificate>();
+            EnvelopeDocument = Set<EnvelopeDocument>();
+            EnvelopeHistories = Set<EnvelopeHistory>();
+            EnvelopeTypes = Set<EnvelopeType>();
+            Receivers = Set<Receiver>();
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
index 42b215a8..399d3269 100644
--- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
+++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
@@ -15,7 +15,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
-    <PackageReference Include="UserManager.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="UserManager.Infrastructure" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs
index 0c7c5b55..5b410f98 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/DocumentReceiverElementRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class DocumentReceiverElementRepository : CRUDRepository<DocumentReceiverElement, int, EGDbContext>, IDocumentReceiverElementRepository
     {
-        public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext)
+        public DocumentReceiverElementRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentReceiverElements)
         {
         }
     }
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs
index 0bb95c99..e27e56a6 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/DocumentStatusRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class DocumentStatusRepository : CRUDRepository<DocumentStatus, int, EGDbContext>, IDocumentStatusRepository
     {
-        public DocumentStatusRepository(EGDbContext dbContext) : base(dbContext)
+        public DocumentStatusRepository(EGDbContext dbContext) : base(dbContext, dbContext.DocumentStatus)
         {
         }
     }
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
index dc80e97b..ac257a48 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
@@ -12,7 +12,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
     {
         private readonly IMemoryCache _cache;
 
-		public EmailTemplateRepository(EGDbContext dbContext, IMemoryCache cache) : base(dbContext)
+		public EmailTemplateRepository(EGDbContext dbContext, IMemoryCache cache) : base(dbContext, dbContext.EmailTemplate)
         {
             _cache = cache;
         }
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs
index 5cc4195e..0c91e5f4 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeCertificateRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class EnvelopeCertificateRepository : CRUDRepository<EnvelopeCertificate, int, EGDbContext>, IEnvelopeCertificateRepository
     {
-        public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeCertificateRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeCertificates)
         {
         }
     }
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs
index 57fa4eee..25ff8949 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeDocumentRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class EnvelopeDocumentRepository : CRUDRepository<EnvelopeDocument, int, EGDbContext>, IEnvelopeDocumentRepository
     {
-        public EnvelopeDocumentRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeDocumentRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeDocument)
         {
         }
     }
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
index 2c3c64c3..2c7a5b41 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
@@ -8,7 +8,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class EnvelopeHistoryRepository : CRUDRepository<EnvelopeHistory, long, EGDbContext>, IEnvelopeHistoryRepository
     {
-        public EnvelopeHistoryRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeHistoryRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeHistories)
         {
         }
 
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs
index 9b7533e3..57308ea4 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeTypeRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class EnvelopeTypeRepository : CRUDRepository<EnvelopeType, int, EGDbContext>, IEnvelopeTypeRepository
     {
-        public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext)
+        public EnvelopeTypeRepository(EGDbContext dbContext) : base(dbContext, dbContext.EnvelopeTypes)
         {
         }
     }
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs
index 91d6e812..bccb6c1b 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/ReceiverRepository.cs
@@ -7,7 +7,7 @@ namespace EnvelopeGenerator.Infrastructure.Repositories
 {
     public class ReceiverRepository : CRUDRepository<Receiver, int, EGDbContext>, IReceiverRepository
     {
-        public ReceiverRepository(EGDbContext dbContext) : base(dbContext)
+        public ReceiverRepository(EGDbContext dbContext) : base(dbContext, dbContext.Receivers)
         {
         }