diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
index 8c1004d3..8ad0604b 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeType.cs
@@ -12,7 +12,7 @@ namespace EnvelopeGenerator.Domain.Entities
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [Column("GUID")]
-        public int Id { get; set; }
+        public int Id { get; set; } = 0;
 
         [Required]
         [Column("TITLE", TypeName = "nvarchar(128)")]
@@ -25,16 +25,16 @@ namespace EnvelopeGenerator.Domain.Entities
         public int ExpiresDays { get; set; }
 
         [Column("CERTIFICATION_TYPE")]
-        public int CertificationType { get; set; }
+        public Constants.CertificationType CertificationType { get; set; } = Constants.CertificationType.AdvancedElectronicSignature;
 
         [Column("USE_ACCESS_CODE")]
         public bool UseAccessCode { get; set; }
 
         [Column("FINAL_EMAIL_TO_CREATOR")]
-        public int FinalEmailToCreator { get; set; }
+        public Constants.FinalEmailType FinalEmailToCreator { get; set; }
 
         [Column("FINAL_EMAIL_TO_RECEIVERS")]
-        public int FinalEmailToReceivers { get; set; }
+        public Constants.FinalEmailType FinalEmailToReceivers { get; set; }
 
         [Required]
         [Column("ADDED_WHEN", TypeName = "datetime")]
@@ -47,15 +47,43 @@ namespace EnvelopeGenerator.Domain.Entities
         public int ExpiresWarningDays { get; set; }
 
         [Column("SEND_REMINDER_EMAILS")]
-        public bool SendReminderEmails { get; set; }
+        public bool SendReminderEmails { get; set; } = false;
 
         [Column("FIRST_REMINDER_DAYS")]
-        public int FirstReminderDays { get; set; }
+        public int FirstReminderDays { get; set; } = 0;
 
         [Column("REMINDER_INTERVAL_DAYS")]
-        public int ReminderIntervalDays { get; set; }
+        public int ReminderIntervalDays { get; set; } = 0;
 
         [Column("CONTRACT_TYPE")]
         public int ContractType { get; set; }
+
+        [NotMapped]
+        public bool TFA_Enabled { get; set; } = false;
+
+        [NotMapped]
+        public DateTime ExpiresWhen { get; set; }
+
+        [NotMapped]
+        public DateTime ExpiresWarningWhen { get; set; }
+
+        [NotMapped]
+        public int ExpiresWhenDays
+        {
+            get => ExpiresDays;
+            set => ExpiresDays = value;
+        }
+
+        [NotMapped]
+        public int ExpiresWarningWhenDays
+        {
+            get => ExpiresWarningDays;
+            set => ExpiresWarningDays = value;
+        }
+
+        public override string ToString()
+        {
+            return Title;
+        }
     }
 }
\ No newline at end of file