diff --git a/EnvelopeGenerator.Domain/Entities/Document.cs b/EnvelopeGenerator.Domain/Entities/Document.cs
index c4c9910f..db4f02d7 100644
--- a/EnvelopeGenerator.Domain/Entities/Document.cs
+++ b/EnvelopeGenerator.Domain/Entities/Document.cs
@@ -31,17 +31,39 @@ public class Document : IHasEnvelope
 
     [Required]
     [Column("ENVELOPE_ID")]
-    public int EnvelopeId { get; set; } = 0;
+    public int EnvelopeId { get; set; }
+#if NETFRAMEWORK
+        = 0;
+#endif
 
     [Column("BYTE_DATA", TypeName = "varbinary(max)")]
-    public byte[] ByteData { get; set; }
+    public byte[]
+#if NET
+        ?
+#endif
+        ByteData { get; set; }
 
-    public List<Signature> Elements { get; set; }
+    #region File
+    [Column("FILENAME", TypeName = "nvarchar(256)")]
+    public string Filename { get; set; }
 
-    // TODO: * Check the Form App and remove the default value
-    [NotMapped]
+    [Column("FILEPATH", TypeName = "nvarchar(256)")]
     public string Filepath { get; set; }
 
+    [Column("FILENAME_ORIGINAL", TypeName = "nvarchar(256)")]
+    public string
+#if NET
+        ?
+#endif
+        FileNameOriginal { get; set; }
+    #endregion
+
+    public virtual List<Signature>
+#if NET
+        ?
+#endif
+        Elements { get; set; }
+
     [ForeignKey("EnvelopeId")]
     public virtual Envelope
 #if NET
@@ -50,15 +72,9 @@ public class Document : IHasEnvelope
         Envelope { get; set; }
 
 #if NETFRAMEWORK
-    [NotMapped]
-    public string FileNameOriginal { get; set; }
-
     [NotMapped]
     public bool IsTempFile { get; set; }
 
-    [NotMapped]
-    public string Filename { get; set; }
-
     [NotMapped]
     public Bitmap Thumbnail { get; set; }