diff --git a/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs b/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs
index be0ea002..9d69a061 100644
--- a/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs
+++ b/EnvelopeGenerator.Application/Contracts/Services/IEmailTemplateService.cs
@@ -2,7 +2,7 @@
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Application.Contracts.Services;
 
diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb b/EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb
deleted file mode 100644
index 012c22b5..00000000
--- a/EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb
+++ /dev/null
@@ -1,20 +0,0 @@
-Imports System.Drawing
-Imports System.IO
-
-Public Class EnvelopeDocument
-    Public Property Id As Integer
-
-    Public Property FileNameOriginal As String
-
-    Public Property IsTempFile As Boolean = True
-
-    Public Property EnvelopeId As Integer = 0
-
-    Public Property Elements As New List(Of EnvelopeDocumentElement)
-
-    Public Property Filename As String
-
-    Public Property Filepath As String
-
-    Public Property ByteData As Byte()
-End Class
\ No newline at end of file
diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
index 2b1babf1..80c64190 100644
--- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
+++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj
@@ -280,7 +280,6 @@
     <Compile Include="Jobs\APIBackendJobs\APIEnvelopeJob.vb" />
     <Compile Include="Jobs\FinalizeDocument\PDFBurnerParams.vb" />
     <Compile Include="Services\TemplateService.vb" />
-    <Compile Include="Entities\EnvelopeDocument.vb" />
     <Compile Include="Entities\EnvelopeDocumentElement.vb" />
     <Compile Include="Entities\EnvelopeHistoryEntry.vb" />
     <Compile Include="Entities\EnvelopeReceiver.vb" />
diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs
index e59b79ef..9d92e6f8 100644
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -140,7 +140,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public IEnumerable<EnvelopeHistory> History { get; set; } = new List<EnvelopeHistory>();
 
         // TODO: * Check the Form App and remove the default value
-        public IEnumerable<Receiver> Receivers { get; set; } = new List<Receiver>();
+        public ICollection<Receiver> Receivers { get; set; } = new List<Receiver>();
 
         /// <summary>
         /// Validates whether the receiver and document data are complete.
diff --git a/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs b/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
index 78573dbe..ecfc3eec 100644
--- a/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
+++ b/EnvelopeGenerator.Domain/Entities/EnvelopeDocument.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Drawing;
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
@@ -27,7 +28,7 @@ namespace EnvelopeGenerator.Domain.Entities
         public byte[] ByteData { get; set; }
 
         // TODO: * Check the Form App and remove the default value
-        public IEnumerable<DocumentReceiverElement> Elements { get; set; } = new List<DocumentReceiverElement>();
+        public List<DocumentReceiverElement> Elements { get; set; } = new List<DocumentReceiverElement>();
 
         [NotMapped]
         public string FileNameOriginal { get; set; }
@@ -38,6 +39,13 @@ namespace EnvelopeGenerator.Domain.Entities
         [NotMapped]
         public string Filename { get; set; }
 
+        [NotMapped]
         public string Filepath { get; set; }
+
+        [NotMapped]
+        public Bitmap Thumbnail { get; set; }
+
+        [NotMapped]
+        public int PageCount { get; set; }
     }
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
index 83410283..98cc4948 100644
--- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
+++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj
@@ -16,6 +16,19 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
 	  <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+	  <PackageReference Include="System.Drawing.Common" Version="4.7.3" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+	  <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	  <PackageReference Include="System.Drawing.Common" Version="8.0.16" />
+  </ItemGroup>
+	
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+	  <PackageReference Include="System.Drawing.Common" Version="9.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/EnvelopeGenerator.Extensions/DecodingExtensions.cs b/EnvelopeGenerator.Extensions/DecodingExtensions.cs
index d9b16f23..ad5e6800 100644
--- a/EnvelopeGenerator.Extensions/DecodingExtensions.cs
+++ b/EnvelopeGenerator.Extensions/DecodingExtensions.cs
@@ -1,5 +1,5 @@
 using System.Text;
-using static EnvelopeGenerator.Common.Constants;
+using static EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Extensions
 {
diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
index f246c083..daba997e 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -183,7 +183,7 @@ Public Class EnvelopeEditorController
                 .FileNameOriginal = oFileInfo.Name,
                 .Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
                 .PageCount = Thumbnail.GetPageCount(oTempFilePath),
-                .Byte_Data = ReadFile(oFixedPath)
+                .ByteData = ReadFile(oFixedPath)
             }
 
             Return oDocument
diff --git a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
index 38999c07..d50cc359 100644
--- a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
@@ -2,6 +2,7 @@
 Imports EnvelopeGenerator.Common
 Imports GdPicture14.Annotations
 Imports EnvelopeGenerator.Domain
+Imports EnvelopeGenerator.Domain.Entities
 
 Public Class FieldEditorController
     Inherits BaseController
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index dba158be..a3f5f703 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -123,7 +123,7 @@ Partial Public Class frmEnvelopeEditor
 
                         File.Delete(oTempFilename)
                     End If
-                    WriteBytetoPath(oTempFilename, docItem.Byte_Data)
+                    WriteBytetoPath(oTempFilename, docItem.ByteData)
                     docItem.Filepath = oTempFilename
                     GridDocuments.Tag = docItem.Filepath
                 End If
@@ -215,11 +215,11 @@ Partial Public Class frmEnvelopeEditor
             If ViewDocuments.GetSelectedRows().Count > 0 Then
                 Dim oDocument As EnvelopeDocument = DirectCast(ViewDocuments.GetFocusedRow(), EnvelopeDocument)
                 Dim oEnvelope = Controller.Envelope
-                If Not IsNothing(oDocument.Byte_Data) Then
+                If Not IsNothing(oDocument.ByteData) Then
                     Dim oTempFolder = TempFiles._TempPath
                     Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{oEnvelope.Id}.pdf")
                     If Not File.Exists(oTempFilename) Then
-                        WriteBytetoPath(oTempFilename, oDocument.Byte_Data)
+                        WriteBytetoPath(oTempFilename, oDocument.ByteData)
                         oDocument.Filepath = oTempFilename
                     End If
 
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index b1bab98f..fb2562e1 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -12,7 +12,7 @@ Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.My
 Imports System.ComponentModel
 Imports DevExpress.XtraPrinting
-Imports DigitalData.Domain
+Imports EnvelopeGenerator.Domain.Entities
 
 Public Class frmMain
     Private ReadOnly LogConfig As LogConfig
@@ -405,7 +405,7 @@ Public Class frmMain
                 Me.Cursor = Cursors.Default
                 Exit Sub
             Else
-                If Not IsNothing(oDocument.Byte_Data) Then
+                If Not IsNothing(oDocument.ByteData) Then
                     Dim oTempFolder = TempFiles._TempPath
                     Dim oTempFilename = String.Concat(oTempFolder, "\", $"ViewEnvDoc_{oEnvelope.Id}.pdf")
                     If File.Exists(oTempFilename) Then
@@ -420,7 +420,7 @@ Public Class frmMain
 
                         File.Delete(oTempFilename)
                     End If
-                    downloadFile(oTempFilename, oDocument.Byte_Data)
+                    downloadFile(oTempFilename, oDocument.ByteData)
                 End If
             End If
         Catch ex As Exception