diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
index 75388b4d..cba66f9f 100644
--- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
@@ -11,7 +11,6 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using DigitalData.UserManager.Infrastructure;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.Core.Client;
-using EnvelopeGenerator.Application.Common.Configurations;
 #elif NETFRAMEWORK
 using System.Linq;
 #endif
@@ -40,7 +39,7 @@ public abstract class EGDbContextBase : DbContext
     , IUserManagerDbContext, IMailDbContext
 #endif
 {
-    public DbSet<Domain.Entities.Config> Configs { get; set; }
+    public DbSet<Config> Configs { get; set; }
 
     public DbSet<EnvelopeReceiver> EnvelopeReceivers { get; set; }
 
@@ -98,27 +97,6 @@ public abstract class EGDbContextBase : DbContext
     {
         _triggers = triggerParamOptions.Value;
         _logger = logger;
-
-        Configs = Set<Config>();
-        EnvelopeReceivers = Set<EnvelopeReceiver>();
-        Envelopes = Set<Envelope>();
-        DocumentReceiverElements = Set<Signature>();
-        DocumentStatus = Set<DocumentStatus>();
-        EnvelopeDocument = Set<Document>();
-        EnvelopeHistories = Set<History>();
-        EnvelopeTypes = Set<EnvelopeType>();
-        Receivers = Set<Receiver>();
-
-        GroupOfUsers = Set<GroupOfUser>();
-        Groups = Set<Group>();
-        ModuleOfUsers = Set<ModuleOfUser>();
-        Modules = Set<Module>();
-        Users = Set<User>();
-        UserReps = Set<UserRep>();
-#if NET
-        EMailOuts = Set<EmailOut>();
-#endif
-        EnvelopeReceiverReadOnlys = Set<EnvelopeReceiverReadOnly>();
     }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -215,6 +193,13 @@ public abstract class EGDbContextBase : DbContext
             .HasForeignKey(ds => ds.ReceiverId);
         #endregion DocumentStatus
 
+        #region Annotation
+        modelBuilder.Entity<Signature>()
+            .HasMany(signature => signature.Annotations)
+            .WithOne(annot => annot.Element)
+            .HasForeignKey(annot => annot.ElementId);
+        #endregion
+
         #region Trigger
         // Configure entities to handle database triggers
         void AddTrigger<T>() where T : class => _triggers