diff --git a/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs b/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
index 03963fcb..88b2e24d 100644
--- a/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
+++ b/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
@@ -5,45 +5,44 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
-    public class DocumentStatus
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public int Id { get; set; }
-
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
-
-        [Required]
-        [Column("RECEIVER_ID")]
-        public int ReceiverId { get; set; }
+#endif
 
+[Table("TBSIG_DOCUMENT_STATUS", Schema = "dbo")]
+public class DocumentStatus
+{
+    public DocumentStatus()
+    {
         // TODO: * check Form Application and remove default value
-        [Required]
-        [Column("STATUS")]
-        public Constants.DocumentStatus Status { get; set; } = Constants.DocumentStatus.Created;
-
-        [Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime StatusChangedWhen { get; set; }
-
-        [Column("VALUE", TypeName = "nvarchar(max)")]
-        public string Value { get; set; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public DateTime AddedWhen { get; set; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime ChangedWhen { get; set; }
-
-        [ForeignKey("EnvelopeId")]
-        public virtual Envelope Envelope { get; set; }
-
-        [ForeignKey("ReceiverId")]
-        public virtual Receiver Receiver { get; set; }
+#if NETFRAMEWORK
+        Status = Constants.DocumentStatus.Created;
+#endif
     }
-}
\ No newline at end of file
+
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public int Id { get; set; }
+
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
+
+    [Required]
+    [Column("RECEIVER_ID")]
+    public int ReceiverId { get; set; }
+
+    [Required]
+    [Column("STATUS")]
+    public Constants.DocumentStatus Status { get; set; }
+
+    [Column("VALUE", TypeName = "nvarchar(max)")]
+    public string Value { get; set; }
+}
+
+#if NETFRAMEWORK
+    }
+#endif
\ No newline at end of file