diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index b03ebc58..e3637be6 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -138,11 +138,9 @@ namespace EnvelopeGenerator.Domain.Entities
         public byte[] DOC_RESULT { get; set; }
 
         // TODO: * Check the Form App and remove the default value
-        [NotMapped]
         public List<EnvelopeDocument> Documents { get; set; } = new List<EnvelopeDocument>();
 
         // TODO: * Check the Form App and remove the default value
-        [NotMapped]
         public List<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
 
         // TODO: * Check the Form App and remove the default value
diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
index ecfc3eec..ff40a90d 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
@@ -27,9 +27,10 @@ namespace EnvelopeGenerator.Domain.Entities
         [Column("BYTE_DATA", TypeName = "varbinary(max)")]
         public byte[] ByteData { get; set; }
 
-        // TODO: * Check the Form App and remove the default value
         public List<DocumentReceiverElement> Elements { get; set; } = new List<DocumentReceiverElement>();
 
+
+        // TODO: * Check the Form App and remove the default value
         [NotMapped]
         public string FileNameOriginal { get; set; }