diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
index e0be9122..47b5ada5 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeHistory.cs
@@ -6,45 +6,42 @@ using System;
 #endif
 
 namespace EnvelopeGenerator.Domain.Entities
-{
-    [Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
-    public class EnvelopeHistory
+#if NET
+    ;
+#elif NETFRAMEWORK
     {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        [Column("GUID")]
-        public long Id { get; set; }
+#endif
 
-        [Required]
-        [Column("ENVELOPE_ID")]
-        public int EnvelopeId { get; set; }
+[Table("TBSIG_ENVELOPE_HISTORY", Schema = "dbo")]
+public class EnvelopeHistory
+{
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    [Column("GUID")]
+    public long Id { get; set; }
 
-        [Required]
-        [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
-        public string UserReference { get; set; }
+    [Required]
+    [Column("ENVELOPE_ID")]
+    public int EnvelopeId { get; set; }
 
-        [Required]
-        [Column("STATUS")]
-        public Constants.EnvelopeStatus  Status { get; set; }
+    [Required]
+    [Column("USER_REFERENCE", TypeName = "nvarchar(128)")]
+    public string UserReference { get; set; }
 
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public DateTime AddedWhen { get; set; }
+    [Required]
+    [Column("STATUS")]
+    public Constants.EnvelopeStatus  Status { get; set; }
 
-        [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime ActionDate { get; set; } = DateTime.Now;
+    public virtual User Sender { get; set; }
 
-        [Column("COMMENT", TypeName = "nvarchar(max)")]
-        public string Comment { get; set; }
-
-        public virtual User Sender { get; set; }
-
-        public virtual Receiver Receiver { get; set; }
+    public virtual Receiver Receiver { get; set; }
 
 #if NETFRAMEWORK
-        [NotMapped]
-        public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
+    [NotMapped]
+    public string StatusTranslated => My.Resources.Model.ResourceManager.GetString(Status.ToString());
 #endif
+}
+
+#if NETFRAMEWORK
     }
-}
\ No newline at end of file
+#endif
\ No newline at end of file