diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs
index d4b5d300..ad4687d7 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeReceiver.cs
@@ -79,15 +79,9 @@ public class EnvelopeReceiver
         Company { get; set; }
 
     #region Model of old serice
-    [NotMapped]
-    public DateTime SignedDate { get; set; } = DateTime.MinValue;
-
     [NotMapped]
     public Constants.ReceiverStatus Status { get; set; }
 
-    [NotMapped]
-    public Constants.ColorType ColorType { get; set; }
-
     [NotMapped]
     public bool HasId => Id.Item1 > 0 && Id.Item2 > 0;
 
@@ -95,18 +89,6 @@ public class EnvelopeReceiver
     public bool HasEmailAndName =>
         !string.IsNullOrWhiteSpace(Receiver.EmailAddress) &&
         !string.IsNullOrWhiteSpace(Name);
-
-    [NotMapped]
-    public string SignedDateDisplayValue =>
-        SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
-
-    [NotMapped]
-    public Color Color => ColorType.ToColor();
-
-    public string GetSignature()
-    {
-        return Receiver.EmailAddress.ToUpperInvariant().GetChecksum();
-    }
     #endregion
 }
 
diff --git a/EnvelopeGenerator.Domain/Entities/Receiver.cs b/EnvelopeGenerator.Domain/Entities/Receiver.cs
index 58315ee9..31600dda 100644
--- a/EnvelopeGenerator.Domain/Entities/Receiver.cs
+++ b/EnvelopeGenerator.Domain/Entities/Receiver.cs
@@ -41,6 +41,26 @@ public class Receiver
     public DateTime? TfaRegDeadline { get; set; }
 
     public List<EnvelopeReceiver> EnvelopeReceivers { get; set; }
+
+    #region Model of old serice
+    [NotMapped]
+    public DateTime SignedDate { get; set; } = DateTime.MinValue;
+
+    [NotMapped]
+    public Constants.ColorType ColorType { get; set; }
+
+    [NotMapped]
+    public string SignedDateDisplayValue =>
+        SignedDate == DateTime.MinValue ? "-" : SignedDate.ToString("G");
+
+    [NotMapped]
+    public Color Color => ColorType.ToColor();
+
+    public string GetSignature()
+    {
+        return EmailAddress.ToUpperInvariant().GetChecksum();
+    }
+    #endregion
 }
 
 #if NETFRAMEWORK