MS Anpassungen

Handling InsertReceivers und kleinigkeiten frm Main
Logging wegen Y-Konstante
2025-11-12 21:43:50 +01:00 · 2025-09-16 09:00:43 +02:00 · 2025-09-04 14:35:54 +02:00
460 changed files with 13166 additions and 17921 deletions
--- a/EnvelopeGenerator.Application.VB/EnvelopeGenerator.Application.VB.vbproj
+++ b/EnvelopeGenerator.Application.VB/EnvelopeGenerator.Application.VB.vbproj
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <RootNamespace>EnvelopeGenerator.Application.VB</RootNamespace>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DevExpress.Data" Version="21.2.4" />
-    <PackageReference Include="DevExpress.Reporting.Core" Version="21.2.4" />
-    <PackageReference Include="DevExpress.Win" Version="21.2.0" />
-    <PackageReference Include="DevExpress.Xpo" Version="21.2.4" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Reports\rptEnvelopeHistory.vb">
-      <SubType>Component</SubType>
-    </Compile>
-  </ItemGroup>
-
-</Project>
--- a/EnvelopeGenerator.Application.VB/Reports/rptEnvelopeHistory.Designer.vb
+++ b/EnvelopeGenerator.Application.VB/Reports/rptEnvelopeHistory.Designer.vb
@@ -1,730 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Public Class rptEnvelopeHistory
-    Inherits DevExpress.XtraReports.UI.XtraReport
-
-    'XtraReport overrides dispose to clean up the component list.
-    <System.Diagnostics.DebuggerNonUserCode()> _
-    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
-        If disposing AndAlso components IsNot Nothing Then
-            components.Dispose()
-        End If
-        MyBase.Dispose(disposing)
-    End Sub
-
-    'Required by the Designer
-    Private components As System.ComponentModel.IContainer
-
-    'NOTE: The following procedure is required by the Designer
-    'It can be modified using the Designer.  
-    'Do not modify it using the code editor.
-    <System.Diagnostics.DebuggerStepThrough()> _
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(rptEnvelopeHistory))
-        Me.TopMargin = New DevExpress.XtraReports.UI.TopMarginBand()
-        Me.BottomMargin = New DevExpress.XtraReports.UI.BottomMarginBand()
-        Me.XrLabel1 = New DevExpress.XtraReports.UI.XRLabel()
-        Me.pageInfo1 = New DevExpress.XtraReports.UI.XRPageInfo()
-        Me.pageInfo2 = New DevExpress.XtraReports.UI.XRPageInfo()
-        Me.ReportHeader = New DevExpress.XtraReports.UI.ReportHeaderBand()
-        Me.label1 = New DevExpress.XtraReports.UI.XRLabel()
-        Me.XrTable3 = New DevExpress.XtraReports.UI.XRTable()
-        Me.XrTableRow8 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.XrTableCell13 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell15 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableRow9 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.XrTableCell14 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell17 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell16 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell18 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableRow10 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.XrTableCell19 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell20 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell21 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell22 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableRow11 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.XrTableCell23 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell24 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell25 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.XrTableCell26 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.GroupHeader1 = New DevExpress.XtraReports.UI.GroupHeaderBand()
-        Me.table1 = New DevExpress.XtraReports.UI.XRTable()
-        Me.tableRow1 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.tableCell1 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.tableCell2 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.tableCell3 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.Detail = New DevExpress.XtraReports.UI.DetailBand()
-        Me.table2 = New DevExpress.XtraReports.UI.XRTable()
-        Me.tableRow2 = New DevExpress.XtraReports.UI.XRTableRow()
-        Me.tableCell4 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.tableCell5 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.tableCell6 = New DevExpress.XtraReports.UI.XRTableCell()
-        Me.Title = New DevExpress.XtraReports.UI.XRControlStyle()
-        Me.DetailCaption1 = New DevExpress.XtraReports.UI.XRControlStyle()
-        Me.DetailData1 = New DevExpress.XtraReports.UI.XRControlStyle()
-        Me.DetailData3_Odd = New DevExpress.XtraReports.UI.XRControlStyle()
-        Me.PageInfo = New DevExpress.XtraReports.UI.XRControlStyle()
-        Me.GalleryDropDown1 = New DevExpress.XtraBars.Ribbon.GalleryDropDown(Me.components)
-        Me.ObjectDataSource1 = New DevExpress.DataAccess.ObjectBinding.ObjectDataSource(Me.components)
-        CType(Me.XrTable3, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.table1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.table2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GalleryDropDown1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me, System.ComponentModel.ISupportInitialize).BeginInit()
-        '
-        'TopMargin
-        '
-        Me.TopMargin.Dpi = 254.0!
-        Me.TopMargin.HeightF = 190.6042!
-        Me.TopMargin.Name = "TopMargin"
-        '
-        'BottomMargin
-        '
-        Me.BottomMargin.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.XrLabel1, Me.pageInfo1, Me.pageInfo2})
-        Me.BottomMargin.Dpi = 254.0!
-        Me.BottomMargin.Name = "BottomMargin"
-        '
-        'XrLabel1
-        '
-        Me.XrLabel1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.XrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top
-        Me.XrLabel1.Dpi = 254.0!
-        Me.XrLabel1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
-        Me.XrLabel1.LocationFloat = New DevExpress.Utils.PointFloat(896.5417!, 0!)
-        Me.XrLabel1.Name = "XrLabel1"
-        Me.XrLabel1.Padding = New DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 254.0!)
-        Me.XrLabel1.SizeF = New System.Drawing.SizeF(645.5836!, 58.0!)
-        Me.XrLabel1.StyleName = "Title"
-        Me.XrLabel1.StylePriority.UseBorderColor = False
-        Me.XrLabel1.StylePriority.UseBorders = False
-        Me.XrLabel1.StylePriority.UseFont = False
-        Me.XrLabel1.StylePriority.UsePadding = False
-        Me.XrLabel1.Text = "Erstellt mit SignFlow"
-        '
-        'pageInfo1
-        '
-        Me.pageInfo1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.pageInfo1.Borders = DevExpress.XtraPrinting.BorderSide.Top
-        Me.pageInfo1.Dpi = 254.0!
-        Me.pageInfo1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
-        Me.pageInfo1.Name = "pageInfo1"
-        Me.pageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime
-        Me.pageInfo1.SizeF = New System.Drawing.SizeF(896.5417!, 58.0!)
-        Me.pageInfo1.StyleName = "PageInfo"
-        Me.pageInfo1.StylePriority.UseBorderColor = False
-        Me.pageInfo1.StylePriority.UseBorders = False
-        Me.pageInfo1.TextFormatString = "{0:dddd, d. MMMM yyyy HH:mm}"
-        '
-        'pageInfo2
-        '
-        Me.pageInfo2.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.pageInfo2.Borders = DevExpress.XtraPrinting.BorderSide.Top
-        Me.pageInfo2.Dpi = 254.0!
-        Me.pageInfo2.LocationFloat = New DevExpress.Utils.PointFloat(1542.125!, 0!)
-        Me.pageInfo2.Name = "pageInfo2"
-        Me.pageInfo2.SizeF = New System.Drawing.SizeF(357.875!, 58.0!)
-        Me.pageInfo2.StyleName = "PageInfo"
-        Me.pageInfo2.StylePriority.UseBorderColor = False
-        Me.pageInfo2.StylePriority.UseBorders = False
-        Me.pageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight
-        Me.pageInfo2.TextFormatString = "Seite {0} von {1}"
-        '
-        'ReportHeader
-        '
-        Me.ReportHeader.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.label1, Me.XrTable3})
-        Me.ReportHeader.Dpi = 254.0!
-        Me.ReportHeader.HeightF = 406.0843!
-        Me.ReportHeader.Name = "ReportHeader"
-        '
-        'label1
-        '
-        Me.label1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.label1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.label1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
-        Me.label1.BorderWidth = 2.0!
-        Me.label1.Dpi = 254.0!
-        Me.label1.Font = New System.Drawing.Font("Segoe UI", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.label1.ForeColor = System.Drawing.Color.Black
-        Me.label1.LocationFloat = New DevExpress.Utils.PointFloat(0.0002422333!, 0!)
-        Me.label1.Name = "label1"
-        Me.label1.Padding = New DevExpress.XtraPrinting.PaddingInfo(10, 10, 5, 5, 254.0!)
-        Me.label1.SizeF = New System.Drawing.SizeF(1900.0!, 77.32857!)
-        Me.label1.StyleName = "Title"
-        Me.label1.StylePriority.UseBackColor = False
-        Me.label1.StylePriority.UseBorderColor = False
-        Me.label1.StylePriority.UseBorders = False
-        Me.label1.StylePriority.UseBorderWidth = False
-        Me.label1.StylePriority.UseFont = False
-        Me.label1.StylePriority.UseForeColor = False
-        Me.label1.StylePriority.UsePadding = False
-        Me.label1.Text = "Signierungszertifikat"
-        '
-        'XrTable3
-        '
-        Me.XrTable3.Dpi = 254.0!
-        Me.XrTable3.LocationFloat = New DevExpress.Utils.PointFloat(0.0002422333!, 96.60422!)
-        Me.XrTable3.Name = "XrTable3"
-        Me.XrTable3.OddStyleName = "DetailData3_Odd"
-        Me.XrTable3.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.XrTableRow8, Me.XrTableRow9, Me.XrTableRow10, Me.XrTableRow11})
-        Me.XrTable3.SizeF = New System.Drawing.SizeF(1900.0!, 284.4801!)
-        '
-        'XrTableRow8
-        '
-        Me.XrTableRow8.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell13, Me.XrTableCell15})
-        Me.XrTableRow8.Dpi = 254.0!
-        Me.XrTableRow8.Name = "XrTableRow8"
-        Me.XrTableRow8.Weight = 1.0R
-        '
-        'XrTableCell13
-        '
-        Me.XrTableCell13.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.XrTableCell13.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.XrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
-        Me.XrTableCell13.BorderWidth = 1.0!
-        Me.XrTableCell13.Dpi = 254.0!
-        Me.XrTableCell13.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell13.Name = "XrTableCell13"
-        Me.XrTableCell13.StyleName = "DetailCaption1"
-        Me.XrTableCell13.StylePriority.UseBackColor = False
-        Me.XrTableCell13.StylePriority.UseBorderColor = False
-        Me.XrTableCell13.StylePriority.UseBorders = False
-        Me.XrTableCell13.StylePriority.UseBorderWidth = False
-        Me.XrTableCell13.StylePriority.UseForeColor = False
-        Me.XrTableCell13.Text = "Ersteller"
-        Me.XrTableCell13.Weight = 0.38139956730411484R
-        '
-        'XrTableCell15
-        '
-        Me.XrTableCell15.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.XrTableCell15.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.XrTableCell15.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
-        Me.XrTableCell15.BorderWidth = 1.0!
-        Me.XrTableCell15.Dpi = 254.0!
-        Me.XrTableCell15.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell15.Name = "XrTableCell15"
-        Me.XrTableCell15.StyleName = "DetailCaption1"
-        Me.XrTableCell15.StylePriority.UseBackColor = False
-        Me.XrTableCell15.StylePriority.UseBorderColor = False
-        Me.XrTableCell15.StylePriority.UseBorders = False
-        Me.XrTableCell15.StylePriority.UseBorderWidth = False
-        Me.XrTableCell15.StylePriority.UseForeColor = False
-        Me.XrTableCell15.Text = "Umschlag"
-        Me.XrTableCell15.Weight = 0.49859081604996847R
-        '
-        'XrTableRow9
-        '
-        Me.XrTableRow9.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell14, Me.XrTableCell17, Me.XrTableCell16, Me.XrTableCell18})
-        Me.XrTableRow9.Dpi = 254.0!
-        Me.XrTableRow9.Name = "XrTableRow9"
-        Me.XrTableRow9.Weight = 1.0R
-        '
-        'XrTableCell14
-        '
-        Me.XrTableCell14.BackColor = System.Drawing.Color.White
-        Me.XrTableCell14.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell14.Dpi = 254.0!
-        Me.XrTableCell14.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell14.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell14.Multiline = True
-        Me.XrTableCell14.Name = "XrTableCell14"
-        Me.XrTableCell14.StyleName = "DetailCaption1"
-        Me.XrTableCell14.StylePriority.UseBackColor = False
-        Me.XrTableCell14.StylePriority.UseBorderColor = False
-        Me.XrTableCell14.StylePriority.UseBorders = False
-        Me.XrTableCell14.StylePriority.UseFont = False
-        Me.XrTableCell14.StylePriority.UseForeColor = False
-        Me.XrTableCell14.Text = "Name"
-        Me.XrTableCell14.Weight = 0.11578820509129036R
-        '
-        'XrTableCell17
-        '
-        Me.XrTableCell17.BackColor = System.Drawing.Color.White
-        Me.XrTableCell17.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell17.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell17.Dpi = 254.0!
-        Me.XrTableCell17.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[User].[FullName]")})
-        Me.XrTableCell17.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell17.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell17.Multiline = True
-        Me.XrTableCell17.Name = "XrTableCell17"
-        Me.XrTableCell17.StyleName = "DetailCaption1"
-        Me.XrTableCell17.StylePriority.UseBackColor = False
-        Me.XrTableCell17.StylePriority.UseBorderColor = False
-        Me.XrTableCell17.StylePriority.UseBorders = False
-        Me.XrTableCell17.StylePriority.UseFont = False
-        Me.XrTableCell17.StylePriority.UseForeColor = False
-        Me.XrTableCell17.Text = "XrTableCell17"
-        Me.XrTableCell17.Weight = 0.2656113622128245R
-        '
-        'XrTableCell16
-        '
-        Me.XrTableCell16.BackColor = System.Drawing.Color.White
-        Me.XrTableCell16.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell16.Dpi = 254.0!
-        Me.XrTableCell16.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell16.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell16.Multiline = True
-        Me.XrTableCell16.Name = "XrTableCell16"
-        Me.XrTableCell16.StyleName = "DetailCaption1"
-        Me.XrTableCell16.StylePriority.UseBackColor = False
-        Me.XrTableCell16.StylePriority.UseBorderColor = False
-        Me.XrTableCell16.StylePriority.UseBorders = False
-        Me.XrTableCell16.StylePriority.UseFont = False
-        Me.XrTableCell16.StylePriority.UseForeColor = False
-        Me.XrTableCell16.Text = "Titel"
-        Me.XrTableCell16.Weight = 0.11578821158083684R
-        '
-        'XrTableCell18
-        '
-        Me.XrTableCell18.BackColor = System.Drawing.Color.White
-        Me.XrTableCell18.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell18.Dpi = 254.0!
-        Me.XrTableCell18.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[Title]")})
-        Me.XrTableCell18.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell18.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell18.Multiline = True
-        Me.XrTableCell18.Name = "XrTableCell18"
-        Me.XrTableCell18.StyleName = "DetailCaption1"
-        Me.XrTableCell18.StylePriority.UseBackColor = False
-        Me.XrTableCell18.StylePriority.UseBorderColor = False
-        Me.XrTableCell18.StylePriority.UseBorders = False
-        Me.XrTableCell18.StylePriority.UseFont = False
-        Me.XrTableCell18.StylePriority.UseForeColor = False
-        Me.XrTableCell18.Text = "XrTableCell18"
-        Me.XrTableCell18.Weight = 0.38280260446913167R
-        '
-        'XrTableRow10
-        '
-        Me.XrTableRow10.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell19, Me.XrTableCell20, Me.XrTableCell21, Me.XrTableCell22})
-        Me.XrTableRow10.Dpi = 254.0!
-        Me.XrTableRow10.Name = "XrTableRow10"
-        Me.XrTableRow10.Weight = 1.0R
-        '
-        'XrTableCell19
-        '
-        Me.XrTableCell19.BackColor = System.Drawing.Color.White
-        Me.XrTableCell19.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell19.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell19.Dpi = 254.0!
-        Me.XrTableCell19.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell19.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell19.Multiline = True
-        Me.XrTableCell19.Name = "XrTableCell19"
-        Me.XrTableCell19.StyleName = "DetailCaption1"
-        Me.XrTableCell19.StylePriority.UseBackColor = False
-        Me.XrTableCell19.StylePriority.UseBorderColor = False
-        Me.XrTableCell19.StylePriority.UseBorders = False
-        Me.XrTableCell19.StylePriority.UseFont = False
-        Me.XrTableCell19.StylePriority.UseForeColor = False
-        Me.XrTableCell19.Text = "EmailAddress"
-        Me.XrTableCell19.Weight = 0.11578820509129036R
-        '
-        'XrTableCell20
-        '
-        Me.XrTableCell20.BackColor = System.Drawing.Color.White
-        Me.XrTableCell20.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell20.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell20.Dpi = 254.0!
-        Me.XrTableCell20.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[User].[EmailAddress]")})
-        Me.XrTableCell20.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell20.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell20.Multiline = True
-        Me.XrTableCell20.Name = "XrTableCell20"
-        Me.XrTableCell20.StyleName = "DetailCaption1"
-        Me.XrTableCell20.StylePriority.UseBackColor = False
-        Me.XrTableCell20.StylePriority.UseBorderColor = False
-        Me.XrTableCell20.StylePriority.UseBorders = False
-        Me.XrTableCell20.StylePriority.UseFont = False
-        Me.XrTableCell20.StylePriority.UseForeColor = False
-        Me.XrTableCell20.Text = "XrTableCell20"
-        Me.XrTableCell20.Weight = 0.2656113622128245R
-        '
-        'XrTableCell21
-        '
-        Me.XrTableCell21.BackColor = System.Drawing.Color.White
-        Me.XrTableCell21.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell21.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell21.Dpi = 254.0!
-        Me.XrTableCell21.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell21.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell21.Multiline = True
-        Me.XrTableCell21.Name = "XrTableCell21"
-        Me.XrTableCell21.StyleName = "DetailCaption1"
-        Me.XrTableCell21.StylePriority.UseBackColor = False
-        Me.XrTableCell21.StylePriority.UseBorderColor = False
-        Me.XrTableCell21.StylePriority.UseBorders = False
-        Me.XrTableCell21.StylePriority.UseFont = False
-        Me.XrTableCell21.StylePriority.UseForeColor = False
-        Me.XrTableCell21.Text = "Umschlag-ID"
-        Me.XrTableCell21.Weight = 0.11578821158083684R
-        '
-        'XrTableCell22
-        '
-        Me.XrTableCell22.BackColor = System.Drawing.Color.White
-        Me.XrTableCell22.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell22.Dpi = 254.0!
-        Me.XrTableCell22.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[Uuid]")})
-        Me.XrTableCell22.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell22.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell22.Multiline = True
-        Me.XrTableCell22.Name = "XrTableCell22"
-        Me.XrTableCell22.StyleName = "DetailCaption1"
-        Me.XrTableCell22.StylePriority.UseBackColor = False
-        Me.XrTableCell22.StylePriority.UseBorderColor = False
-        Me.XrTableCell22.StylePriority.UseBorders = False
-        Me.XrTableCell22.StylePriority.UseFont = False
-        Me.XrTableCell22.StylePriority.UseForeColor = False
-        Me.XrTableCell22.Text = "XrTableCell22"
-        Me.XrTableCell22.Weight = 0.38280260446913167R
-        '
-        'XrTableRow11
-        '
-        Me.XrTableRow11.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.XrTableCell23, Me.XrTableCell24, Me.XrTableCell25, Me.XrTableCell26})
-        Me.XrTableRow11.Dpi = 254.0!
-        Me.XrTableRow11.Name = "XrTableRow11"
-        Me.XrTableRow11.Weight = 1.0R
-        '
-        'XrTableCell23
-        '
-        Me.XrTableCell23.BackColor = System.Drawing.Color.White
-        Me.XrTableCell23.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell23.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell23.Dpi = 254.0!
-        Me.XrTableCell23.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell23.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell23.Multiline = True
-        Me.XrTableCell23.Name = "XrTableCell23"
-        Me.XrTableCell23.StyleName = "DetailCaption1"
-        Me.XrTableCell23.StylePriority.UseBackColor = False
-        Me.XrTableCell23.StylePriority.UseBorderColor = False
-        Me.XrTableCell23.StylePriority.UseBorders = False
-        Me.XrTableCell23.StylePriority.UseFont = False
-        Me.XrTableCell23.StylePriority.UseForeColor = False
-        Me.XrTableCell23.Weight = 0.11578820509129036R
-        '
-        'XrTableCell24
-        '
-        Me.XrTableCell24.BackColor = System.Drawing.Color.White
-        Me.XrTableCell24.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell24.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell24.Dpi = 254.0!
-        Me.XrTableCell24.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell24.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell24.Multiline = True
-        Me.XrTableCell24.Name = "XrTableCell24"
-        Me.XrTableCell24.StyleName = "DetailCaption1"
-        Me.XrTableCell24.StylePriority.UseBackColor = False
-        Me.XrTableCell24.StylePriority.UseBorderColor = False
-        Me.XrTableCell24.StylePriority.UseBorders = False
-        Me.XrTableCell24.StylePriority.UseFont = False
-        Me.XrTableCell24.StylePriority.UseForeColor = False
-        Me.XrTableCell24.Weight = 0.2656113622128245R
-        '
-        'XrTableCell25
-        '
-        Me.XrTableCell25.BackColor = System.Drawing.Color.White
-        Me.XrTableCell25.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell25.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell25.Dpi = 254.0!
-        Me.XrTableCell25.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell25.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell25.Multiline = True
-        Me.XrTableCell25.Name = "XrTableCell25"
-        Me.XrTableCell25.StyleName = "DetailCaption1"
-        Me.XrTableCell25.StylePriority.UseBackColor = False
-        Me.XrTableCell25.StylePriority.UseBorderColor = False
-        Me.XrTableCell25.StylePriority.UseBorders = False
-        Me.XrTableCell25.StylePriority.UseFont = False
-        Me.XrTableCell25.StylePriority.UseForeColor = False
-        Me.XrTableCell25.Text = "Zertifizierung"
-        Me.XrTableCell25.Weight = 0.11578821158083684R
-        '
-        'XrTableCell26
-        '
-        Me.XrTableCell26.BackColor = System.Drawing.Color.White
-        Me.XrTableCell26.BorderColor = System.Drawing.Color.Empty
-        Me.XrTableCell26.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.XrTableCell26.Dpi = 254.0!
-        Me.XrTableCell26.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[Envelope].[CertificationType]")})
-        Me.XrTableCell26.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.XrTableCell26.ForeColor = System.Drawing.Color.Black
-        Me.XrTableCell26.Multiline = True
-        Me.XrTableCell26.Name = "XrTableCell26"
-        Me.XrTableCell26.StyleName = "DetailCaption1"
-        Me.XrTableCell26.StylePriority.UseBackColor = False
-        Me.XrTableCell26.StylePriority.UseBorderColor = False
-        Me.XrTableCell26.StylePriority.UseBorders = False
-        Me.XrTableCell26.StylePriority.UseFont = False
-        Me.XrTableCell26.StylePriority.UseForeColor = False
-        Me.XrTableCell26.Text = "XrTableCell26"
-        Me.XrTableCell26.Weight = 0.38280260446913161R
-        '
-        'GroupHeader1
-        '
-        Me.GroupHeader1.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table1})
-        Me.GroupHeader1.Dpi = 254.0!
-        Me.GroupHeader1.GroupUnion = DevExpress.XtraReports.UI.GroupUnion.WithFirstDetail
-        Me.GroupHeader1.HeightF = 71.12!
-        Me.GroupHeader1.Name = "GroupHeader1"
-        '
-        'table1
-        '
-        Me.table1.Dpi = 254.0!
-        Me.table1.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
-        Me.table1.Name = "table1"
-        Me.table1.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow1})
-        Me.table1.SizeF = New System.Drawing.SizeF(1900.0!, 71.12!)
-        '
-        'tableRow1
-        '
-        Me.tableRow1.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell1, Me.tableCell2, Me.tableCell3})
-        Me.tableRow1.Dpi = 254.0!
-        Me.tableRow1.Name = "tableRow1"
-        Me.tableRow1.Weight = 1.0R
-        '
-        'tableCell1
-        '
-        Me.tableCell1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.tableCell1.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.tableCell1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
-        Me.tableCell1.BorderWidth = 1.0!
-        Me.tableCell1.Dpi = 254.0!
-        Me.tableCell1.ForeColor = System.Drawing.Color.Black
-        Me.tableCell1.Name = "tableCell1"
-        Me.tableCell1.StyleName = "DetailCaption1"
-        Me.tableCell1.StylePriority.UseBackColor = False
-        Me.tableCell1.StylePriority.UseBorderColor = False
-        Me.tableCell1.StylePriority.UseBorders = False
-        Me.tableCell1.StylePriority.UseBorderWidth = False
-        Me.tableCell1.StylePriority.UseForeColor = False
-        Me.tableCell1.Text = "Ereignis"
-        Me.tableCell1.Weight = 0.51726482588176181R
-        '
-        'tableCell2
-        '
-        Me.tableCell2.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.tableCell2.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.tableCell2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
-        Me.tableCell2.BorderWidth = 1.0!
-        Me.tableCell2.Dpi = 254.0!
-        Me.tableCell2.ForeColor = System.Drawing.Color.Black
-        Me.tableCell2.Name = "tableCell2"
-        Me.tableCell2.StyleName = "DetailCaption1"
-        Me.tableCell2.StylePriority.UseBackColor = False
-        Me.tableCell2.StylePriority.UseBorderColor = False
-        Me.tableCell2.StylePriority.UseBorders = False
-        Me.tableCell2.StylePriority.UseBorderWidth = False
-        Me.tableCell2.StylePriority.UseForeColor = False
-        Me.tableCell2.Text = "Benutzer"
-        Me.tableCell2.Weight = 0.45140669898958585R
-        '
-        'tableCell3
-        '
-        Me.tableCell3.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
-        Me.tableCell3.BorderColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
-        Me.tableCell3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom
-        Me.tableCell3.BorderWidth = 1.0!
-        Me.tableCell3.Dpi = 254.0!
-        Me.tableCell3.ForeColor = System.Drawing.Color.Black
-        Me.tableCell3.Name = "tableCell3"
-        Me.tableCell3.StyleName = "DetailCaption1"
-        Me.tableCell3.StylePriority.UseBackColor = False
-        Me.tableCell3.StylePriority.UseBorderColor = False
-        Me.tableCell3.StylePriority.UseBorders = False
-        Me.tableCell3.StylePriority.UseBorderWidth = False
-        Me.tableCell3.StylePriority.UseForeColor = False
-        Me.tableCell3.Text = "Zeitstempel"
-        Me.tableCell3.Weight = 0.22479583469004233R
-        '
-        'Detail
-        '
-        Me.Detail.Controls.AddRange(New DevExpress.XtraReports.UI.XRControl() {Me.table2})
-        Me.Detail.Dpi = 254.0!
-        Me.Detail.HeightF = 86.174!
-        Me.Detail.HierarchyPrintOptions.Indent = 50.8!
-        Me.Detail.Name = "Detail"
-        '
-        'table2
-        '
-        Me.table2.Dpi = 254.0!
-        Me.table2.LocationFloat = New DevExpress.Utils.PointFloat(0!, 0!)
-        Me.table2.Name = "table2"
-        Me.table2.Rows.AddRange(New DevExpress.XtraReports.UI.XRTableRow() {Me.tableRow2})
-        Me.table2.SizeF = New System.Drawing.SizeF(1900.0!, 63.42!)
-        '
-        'tableRow2
-        '
-        Me.tableRow2.Cells.AddRange(New DevExpress.XtraReports.UI.XRTableCell() {Me.tableCell4, Me.tableCell5, Me.tableCell6})
-        Me.tableRow2.Dpi = 254.0!
-        Me.tableRow2.Name = "tableRow2"
-        Me.tableRow2.Weight = 11.683999633789062R
-        '
-        'tableCell4
-        '
-        Me.tableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.tableCell4.Dpi = 254.0!
-        Me.tableCell4.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemStatusTranslated]")})
-        Me.tableCell4.Name = "tableCell4"
-        Me.tableCell4.StyleName = "DetailData1"
-        Me.tableCell4.StylePriority.UseBorders = False
-        Me.tableCell4.Weight = 0.51726482142156094R
-        '
-        'tableCell5
-        '
-        Me.tableCell5.Dpi = 254.0!
-        Me.tableCell5.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemUserReference]")})
-        Me.tableCell5.Name = "tableCell5"
-        Me.tableCell5.StyleName = "DetailData1"
-        Me.tableCell5.Weight = 0.45140669932916544R
-        '
-        'tableCell6
-        '
-        Me.tableCell6.Dpi = 254.0!
-        Me.tableCell6.ExpressionBindings.AddRange(New DevExpress.XtraReports.UI.ExpressionBinding() {New DevExpress.XtraReports.UI.ExpressionBinding("BeforePrint", "Text", "[ItemDate]")})
-        Me.tableCell6.Name = "tableCell6"
-        Me.tableCell6.StyleName = "DetailData1"
-        Me.tableCell6.StylePriority.UseTextAlignment = False
-        Me.tableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight
-        Me.tableCell6.Weight = 0.22479581593269077R
-        '
-        'Title
-        '
-        Me.Title.BackColor = System.Drawing.Color.Transparent
-        Me.Title.BorderColor = System.Drawing.Color.Black
-        Me.Title.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.Title.BorderWidth = 1.0!
-        Me.Title.Font = New System.Drawing.Font("Arial", 14.25!)
-        Me.Title.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer))
-        Me.Title.Name = "Title"
-        Me.Title.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
-        '
-        'DetailCaption1
-        '
-        Me.DetailCaption1.BackColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer))
-        Me.DetailCaption1.BorderColor = System.Drawing.Color.White
-        Me.DetailCaption1.Borders = DevExpress.XtraPrinting.BorderSide.Left
-        Me.DetailCaption1.BorderWidth = 2.0!
-        Me.DetailCaption1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
-        Me.DetailCaption1.ForeColor = System.Drawing.Color.White
-        Me.DetailCaption1.Name = "DetailCaption1"
-        Me.DetailCaption1.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
-        Me.DetailCaption1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
-        '
-        'DetailData1
-        '
-        Me.DetailData1.BorderColor = System.Drawing.Color.Transparent
-        Me.DetailData1.Borders = DevExpress.XtraPrinting.BorderSide.Left
-        Me.DetailData1.BorderWidth = 2.0!
-        Me.DetailData1.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.DetailData1.ForeColor = System.Drawing.Color.Black
-        Me.DetailData1.Name = "DetailData1"
-        Me.DetailData1.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
-        Me.DetailData1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
-        '
-        'DetailData3_Odd
-        '
-        Me.DetailData3_Odd.BackColor = System.Drawing.Color.FromArgb(CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer), CType(CType(231, Byte), Integer))
-        Me.DetailData3_Odd.BorderColor = System.Drawing.Color.Transparent
-        Me.DetailData3_Odd.Borders = DevExpress.XtraPrinting.BorderSide.None
-        Me.DetailData3_Odd.BorderWidth = 1.0!
-        Me.DetailData3_Odd.Font = New System.Drawing.Font("Arial", 8.25!)
-        Me.DetailData3_Odd.ForeColor = System.Drawing.Color.Black
-        Me.DetailData3_Odd.Name = "DetailData3_Odd"
-        Me.DetailData3_Odd.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
-        Me.DetailData3_Odd.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft
-        '
-        'PageInfo
-        '
-        Me.PageInfo.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold)
-        Me.PageInfo.ForeColor = System.Drawing.Color.FromArgb(CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer), CType(CType(75, Byte), Integer))
-        Me.PageInfo.Name = "PageInfo"
-        Me.PageInfo.Padding = New DevExpress.XtraPrinting.PaddingInfo(15, 15, 0, 0, 254.0!)
-        '
-        'GalleryDropDown1
-        '
-        Me.GalleryDropDown1.Manager = Nothing
-        Me.GalleryDropDown1.Name = "GalleryDropDown1"
-        '
-        'ObjectDataSource1
-        '
-        Me.ObjectDataSource1.DataMember = "Items"
-        'Me.ObjectDataSource1.DataSource = GetType(EnvelopeGenerator.CommonServices.ReportSource)
-        Me.ObjectDataSource1.Name = "ObjectDataSource1"
-        '
-        'rptEnvelopeHistory
-        '
-        Me.Bands.AddRange(New DevExpress.XtraReports.UI.Band() {Me.TopMargin, Me.BottomMargin, Me.ReportHeader, Me.GroupHeader1, Me.Detail})
-        Me.ComponentStorage.AddRange(New System.ComponentModel.IComponent() {Me.ObjectDataSource1})
-        Me.DataSource = Me.ObjectDataSource1
-        Me.Dpi = 254.0!
-        Me.Font = New System.Drawing.Font("Arial", 9.75!)
-        Me.Margins = New System.Drawing.Printing.Margins(100, 100, 191, 100)
-        Me.PageHeight = 2970
-        Me.PageWidth = 2100
-        Me.PaperKind = System.Drawing.Printing.PaperKind.A4
-        Me.ReportUnit = DevExpress.XtraReports.UI.ReportUnit.TenthsOfAMillimeter
-        Me.SnapGridSize = 25.0!
-        Me.StyleSheet.AddRange(New DevExpress.XtraReports.UI.XRControlStyle() {Me.Title, Me.DetailCaption1, Me.DetailData1, Me.DetailData3_Odd, Me.PageInfo})
-        Me.Version = "21.2"
-        Me.Watermark.ImageSource = New DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("rptEnvelopeHistory.Watermark.ImageSource"))
-        Me.Watermark.ImageTransparency = 220
-        CType(Me.XrTable3, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.table1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.table2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GalleryDropDown1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.ObjectDataSource1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me, System.ComponentModel.ISupportInitialize).EndInit()
-
-    End Sub
-
-    Friend WithEvents TopMargin As DevExpress.XtraReports.UI.TopMarginBand
-    Friend WithEvents BottomMargin As DevExpress.XtraReports.UI.BottomMarginBand
-    Friend WithEvents pageInfo1 As DevExpress.XtraReports.UI.XRPageInfo
-    Friend WithEvents pageInfo2 As DevExpress.XtraReports.UI.XRPageInfo
-    Friend WithEvents ReportHeader As DevExpress.XtraReports.UI.ReportHeaderBand
-    Friend WithEvents label1 As DevExpress.XtraReports.UI.XRLabel
-    Friend WithEvents GroupHeader1 As DevExpress.XtraReports.UI.GroupHeaderBand
-    Friend WithEvents table1 As DevExpress.XtraReports.UI.XRTable
-    Friend WithEvents tableRow1 As DevExpress.XtraReports.UI.XRTableRow
-    Friend WithEvents tableCell1 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents tableCell2 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents tableCell3 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents Detail As DevExpress.XtraReports.UI.DetailBand
-    Friend WithEvents table2 As DevExpress.XtraReports.UI.XRTable
-    Friend WithEvents tableRow2 As DevExpress.XtraReports.UI.XRTableRow
-    Friend WithEvents tableCell4 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents tableCell5 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents tableCell6 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents ObjectDataSource1 As DevExpress.DataAccess.ObjectBinding.ObjectDataSource
-    Friend WithEvents Title As DevExpress.XtraReports.UI.XRControlStyle
-    Friend WithEvents DetailCaption1 As DevExpress.XtraReports.UI.XRControlStyle
-    Friend WithEvents DetailData1 As DevExpress.XtraReports.UI.XRControlStyle
-    Friend WithEvents DetailData3_Odd As DevExpress.XtraReports.UI.XRControlStyle
-    Friend WithEvents PageInfo As DevExpress.XtraReports.UI.XRControlStyle
-    Friend WithEvents XrLabel1 As DevExpress.XtraReports.UI.XRLabel
-    Friend WithEvents XrTable3 As DevExpress.XtraReports.UI.XRTable
-    Friend WithEvents XrTableRow8 As DevExpress.XtraReports.UI.XRTableRow
-    Friend WithEvents XrTableCell13 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell15 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableRow9 As DevExpress.XtraReports.UI.XRTableRow
-    Friend WithEvents XrTableCell14 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell17 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell16 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell18 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableRow10 As DevExpress.XtraReports.UI.XRTableRow
-    Friend WithEvents XrTableCell19 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell20 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell21 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell22 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableRow11 As DevExpress.XtraReports.UI.XRTableRow
-    Friend WithEvents XrTableCell23 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell24 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell25 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents XrTableCell26 As DevExpress.XtraReports.UI.XRTableCell
-    Friend WithEvents GalleryDropDown1 As DevExpress.XtraBars.Ribbon.GalleryDropDown
-End Class
--- a/EnvelopeGenerator.Application.VB/Reports/rptEnvelopeHistory.resx
+++ b/EnvelopeGenerator.Application.VB/Reports/rptEnvelopeHistory.resx
--- a/EnvelopeGenerator.Application.VB/Reports/rptEnvelopeHistory.vb
+++ b/EnvelopeGenerator.Application.VB/Reports/rptEnvelopeHistory.vb
@@ -1,3 +0,0 @@
-Public Class rptEnvelopeHistory
-
-End Class
--- a/EnvelopeGenerator.Application/Common/Configurations/GdPictureParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/GdPictureParams.cs
@@ -1,12 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Configurations;
-
-/// <summary>
-/// 
-/// </summary>
-public class GdPictureParams
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string License { get; set; } = null!;
-}
--- a/EnvelopeGenerator.Application/Common/Configurations/PDFBurnerParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/PDFBurnerParams.cs
@@ -1,78 +0,0 @@
-using EnvelopeGenerator.Application.Common.Interfaces.Model;
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-
-namespace EnvelopeGenerator.Application.Common.Configurations;
-
-/// <summary>
-/// 
-/// </summary>
-public class PDFBurnerParams : ITextStyle
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ConcurrencyLimit { get; set; } = 5;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<string> IgnoredLabels { get; set; } = new List<string>
-    {
-        "Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung"
-    };
-
-    /// <summary>
-    /// 
-    /// </summary>
-
-    public double TopMargin { get; set; } = 0.1;
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public double YOffset { get; set; } = -0.3;
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string FontName { get; set; } = "Arial";
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int FontSize { get; set; } = 8;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
-    public FontStyle FontStyle { get; set; } = FontStyle.Italic;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public Dictionary<string, int> IndexOfAnnot { get; init; } = new()
-    {
-        { string.Empty, 0 },
-        { "seal", 0 },
-        { "position", 1 },
-        { "city", 2 },
-        { "date", 3 }
-    };
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int DefaultIndexOfAnnot { get; set; } = 0;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="name"></param>
-    /// <returns></returns>
-    public int GetAnnotationIndex(string name) => IndexOfAnnot.TryGetValue(name, out var value) ? value : DefaultIndexOfAnnot;
-}
--- a/EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/AnnotationDto.cs
@@ -1,73 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
-
-/// <summary>
-/// 
-/// </summary>
-public record AnnotationCreateDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ElementId { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Name { get; init; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Value { get; init; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Type { get; init; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public double? X { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public double? Y { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public double? Width { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public double? Height { get; init; }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public record AnnotationDto : AnnotationCreateDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public long Id { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime AddedWhen { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ChangedWhen { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? ChangedWho { get; init; }
-}
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReportDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReportDto.cs
@@ -1,44 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
-
-/// <summary>
-/// 
-/// </summary>
-public record EnvelopeReportDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public int EnvelopeId { get; set; }
-
-    // --- HEAD ---
-    /// <summary>
-    /// 
-    /// </summary>
-    public string HeadUuid { get; set; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string EnvelopeTitle { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string HeadMessage { get; set; } = null!;
-
-    // --- POSITIONS ---
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ItemStatus { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ItemDate { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string ItemUserReference { get; set; } = null!;
-}
--- a/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Annotation.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Annotation.cs
@@ -1,122 +0,0 @@
-using EnvelopeGenerator.Application.Exceptions;
-
-namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-
-/// <summary>
-/// 
-/// </summary>
-public class Annotation
-{
-    private string? _id;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int EnvelopeId { get; private set; } = 0;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ReceiverId { get; private set; } = 0;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int Index { get; private set; } = 0;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string EgName { get; private set; } = string.Empty;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool HasStructuredID { get; private set; } = false;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool IsLabel
-    {
-        get
-        {
-            if (string.IsNullOrEmpty(EgName))
-                return false;
-
-            var parts = EgName.Split('_');
-            return parts.Length > 1 && parts[1] == "label";
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Id
-    {
-        get => _id;
-        set
-        {
-            _id = value;
-
-            if (string.IsNullOrWhiteSpace(value))
-                throw new BurnAnnotationException("The identifier of annotation is null or empty.");
-
-            var parts = value.Split('#');
-
-            if (parts.Length != 4)
-                return;
-            // throw new BurnAnnotationException($"The identifier of annotation has more or less than 4 sub-part. Id: {_id}");
-
-            if (!int.TryParse(parts[0], out int envelopeId))
-                throw new BurnAnnotationException($"The envelope ID of annotation is not integer. Id: {_id}");
-            EnvelopeId = envelopeId;
-
-            if (!int.TryParse(parts[1], out int receiverId))
-                throw new BurnAnnotationException($"The receiver ID of annotation is not integer. Id: {_id}");
-            ReceiverId = receiverId;
-
-            if (!int.TryParse(parts[2], out int index))
-                throw new BurnAnnotationException($"The index of annotation is not integer. Id: {_id}");
-            Index = index;
-
-            EgName = parts[3];
-            HasStructuredID = true;
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<double>? Bbox { get; set; }
-    
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Type { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool IsSignature { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? ImageAttachmentId { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public Lines? Lines { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int PageIndex { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? StrokeColor { get; set; }
-}
--- a/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Attachment.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Attachment.cs
@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Binary"></param>
-/// <param name="ContentType"></param>
-public record Attachment(string Binary, string ContentType);
--- a/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/FormFieldValue.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/FormFieldValue.cs
@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Name"></param>
-/// <param name="Value"></param>
-public record FormFieldValue(string Name, string? Value = null);
--- a/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Ink.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Ink.cs
@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Lines"></param>
-/// <param name="StrokeColor"></param>
-public record Ink(Lines Lines, string? StrokeColor = null);
--- a/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/InstantData.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/InstantData.cs
@@ -1,50 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-
-/// <summary>
-/// 
-/// </summary>
-public class InstantData
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<Annotation>? Annotations { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<List<Annotation>>? AnnotationsByReceiver
-    {
-        get
-        {
-            return Annotations?
-                .Where(a => a.HasStructuredID)
-                .GroupBy(a => a.ReceiverId)
-                .Select(g => g.ToList());
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public IEnumerable<List<Annotation>>? UnstructuredAnnotations
-    {
-        get
-        {
-            return Annotations?
-                .Where(a => !a.HasStructuredID)
-                .GroupBy(a => a.ReceiverId)
-                .Select(g => g.ToList());
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public Dictionary<string, Attachment>? Attachments { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public List<FormFieldValue>? FormFieldValues { get; set; }
-}
--- a/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Lines.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/PSPDFKitInstant/Lines.cs
@@ -1,7 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Points"></param>
-public record Lines(List<List<List<float>>> Points);
--- a/EnvelopeGenerator.Application/Common/Dto/ThirdPartyModuleDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/ThirdPartyModuleDto.cs
@@ -1,57 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Dto;
-
-/// <summary>
-/// 
-/// </summary>
-public record ThirdPartyModuleDto
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public int Id { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool Active { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Name { get; init; } = default!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Description { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string License { get; init; } = default!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Version { get; init; } = default!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? AddedWho { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? AddedWhen { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? ChangedWho { get; init; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public DateTime? ChangedWhen { get; init; }
-}
--- a/EnvelopeGenerator.Application/Common/EnvelopeFlag.cs
+++ b/EnvelopeGenerator.Application/Common/EnvelopeFlag.cs
@@ -1,27 +0,0 @@
-namespace EnvelopeGenerator.Application.Common;
-
-/// <summary>
-/// 
-/// </summary>
-public enum EnvelopeFlag
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    EnvelopeOrReceiverNonexists,
-
-    /// <summary>
-    /// 
-    /// </summary>
-    NonDecodableEnvelopeReceiverId,
-
-    /// <summary>
-    /// 
-    /// </summary>
-    WrongEnvelopeReceiverId,
-
-    /// <summary>
-    /// 
-    /// </summary>
-    AccessCodeNull
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/DecodingExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/DecodingExtensions.cs
@@ -1,182 +0,0 @@
-using EnvelopeGenerator.Domain.Constants;
-using System.Text;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class DecodingExtensions
-{
-    /// <summary>
-    /// Validates whether a given string is a correctly formatted Base-64 encoded string.
-    /// </summary>
-    /// <remarks>
-    /// This method checks the string for proper Base-64 formatting, which includes validating
-    /// the length of the string (must be divisible by 4). It also checks each character to ensure
-    /// it belongs to the Base-64 character set (A-Z, a-z, 0-9, '+', '/', and '=' for padding).
-    /// The method ensures that padding characters ('=') only appear at the end of the string and
-    /// are in a valid configuration (either one '=' at the end if the string's length % 4 is 3,
-    /// or two '==' if the length % 4 is 2).
-    /// </remarks>
-    /// <param name="input">The Base-64 encoded string to validate.</param>
-    /// <returns>
-    /// <c>true</c> if the string is a valid Base-64 encoded string; otherwise, <c>false</c>.
-    /// </returns>
-    /// <example>
-    /// <code>
-    /// string testString = "TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnk=";
-    /// bool isValid = IsValidBase64String(testString);
-    /// Console.WriteLine(isValid); // Output: true
-    /// </code>
-    /// </example>
-    public static bool IsBase64String(this string input)
-    {
-        // Check if the string is null or empty
-        if (string.IsNullOrEmpty(input))
-        {
-            return false;
-        }
-
-        // Replace valid base-64 padding
-        input = input.Trim();
-        int mod4 = input.Length % 4;
-        if (mod4 > 0)
-        {
-            // Base-64 string lengths should be divisible by 4
-            return false;
-        }
-
-        // Check each character to ensure it is valid base-64
-        foreach (char c in input)
-        {
-            if (!char.IsLetterOrDigit(c) && c != '+' && c != '/' && c != '=')
-            {
-                // Invalid character detected
-                return false;
-            }
-        }
-
-        // Ensure no invalid padding scenarios exist
-        if (input.EndsWith("==") && input.Length % 4 == 0 ||
-            input.EndsWith("=") && input.Length % 4 == 3)
-        {
-            return true;
-        }
-
-        return input.IndexOf('=') == -1; // No padding allowed except at the end
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="encodedKey"></param>
-    /// <param name="decodedKeys"></param>
-    /// <returns></returns>
-    public static bool TryDecode(this string encodedKey, out string[] decodedKeys)
-    {
-        try
-        {
-            byte[] bytes = Convert.FromBase64String(encodedKey);
-            string decodedString = Encoding.UTF8.GetString(bytes);
-            decodedKeys = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
-            return true;
-        }
-        catch(ArgumentNullException) { }
-        catch (FormatException) { }
-        catch(ArgumentException) { }
-
-        decodedKeys = Array.Empty<string>();
-        return false;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="decodedKeys"></param>
-    /// <returns></returns>
-    public static EncodeType GetEncodeType(this string[] decodedKeys) => decodedKeys.Length switch
-    {
-        2 => EncodeType.EnvelopeReceiver,
-        3 => long.TryParse(decodedKeys[1], out var _) ? EncodeType.EnvelopeReceiverReadOnly : EncodeType.Undefined,
-        _ => EncodeType.Undefined,
-    };
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="decodedKeys"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    public static (string? EnvelopeUuid, string? ReceiverSignature) ParseEnvelopeReceiverId(this string[] decodedKeys)
-        => decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiver
-        ? (EnvelopeUuid: decodedKeys[0], ReceiverSignature: decodedKeys[1])
-        : throw new InvalidOperationException("Attempted to convert a decoded other than type EnvelopeReceiver to EnvelopeReceiver.");
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="decodedKeys"></param>
-    /// <returns></returns>
-    /// <exception cref="InvalidOperationException"></exception>
-    public static long ParseReadOnlyId(this string[] decodedKeys)
-        => decodedKeys.GetEncodeType() == EncodeType.EnvelopeReceiverReadOnly
-        ? long.Parse(decodedKeys[1])
-        : throw new InvalidOperationException("Attempted to convert a decoded other than type EnvelopeReceiver to EnvelopeReceiver. ");
-
-    /// <summary>
-    /// Decodes the envelope receiver ID and extracts the envelope UUID and receiver signature.
-    /// </summary>
-    /// <param name="envelopeReceiverId">The base64 encoded string containing the envelope UUID and receiver signature.</param>
-    /// <returns>A tuple containing the envelope UUID and receiver signature.</returns>
-    public static (string? EnvelopeUuid, string? ReceiverSignature) DecodeEnvelopeReceiverId(this string envelopeReceiverId)
-    {
-        if (!envelopeReceiverId.IsBase64String())
-        {
-            return (null, null);
-        }
-        byte[] bytes = Convert.FromBase64String(envelopeReceiverId);
-        string decodedString = Encoding.UTF8.GetString(bytes);
-        string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
-
-        if (parts.Length > 1)
-            return (EnvelopeUuid: parts[0], ReceiverSignature: parts[1]);
-        else
-            return (string.Empty, string.Empty);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="envelopeReceiverReadOnlyId"></param>
-    /// <returns></returns>
-    public static long? DecodeEnvelopeReceiverReadOnlyId(this string envelopeReceiverReadOnlyId)
-    {
-        if (!envelopeReceiverReadOnlyId.IsBase64String())
-        {
-            return null;
-        }
-        byte[] bytes = Convert.FromBase64String(envelopeReceiverReadOnlyId);
-        string decodedString = Encoding.UTF8.GetString(bytes);
-        string[] parts = decodedString.Split(new string[] { "::" }, StringSplitOptions.None);
-
-        if (parts.Length > 2)
-            return long.TryParse(parts[1], out long readOnlyId) ? readOnlyId : null;
-        else
-            return null;
-    }
-
-    /// <summary>
-    /// Gets the envelope UUID from the decoded envelope receiver ID.
-    /// </summary>
-    /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
-    /// <returns>The envelope UUID.</returns>
-    public static string? GetEnvelopeUuid(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().EnvelopeUuid;
-
-    /// <summary>
-    /// Gets the receiver signature from the decoded envelope receiver ID.
-    /// </summary>
-    /// <param name="envelopeReceiverId">The base64 encoded string to decode.</param>
-    /// <returns>The receiver signature.</returns>
-    public static string? GetReceiverSignature(this string envelopeReceiverId) => envelopeReceiverId.DecodeEnvelopeReceiverId().ReceiverSignature;
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/EncodingExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/EncodingExtensions.cs
@@ -1,38 +0,0 @@
-using System.Text;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// Provides extension methods for decoding and extracting information from an envelope receiver ID.
-/// </summary>
-public static class EncodingExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="readOnlyId"></param>
-    /// <returns></returns>
-    public static string ToEnvelopeKey(this long readOnlyId)
-    {
-        //The random number is used as a salt to increase security but it is not saved in the database.
-        string combinedString = $"{Random.Shared.Next()}::{readOnlyId}::{Random.Shared.Next()}";
-        byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
-        string base64String = Convert.ToBase64String(bytes);
-
-        return base64String;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    public static string ToEnvelopeKey(this (string envelopeUuid, string receiverSignature) input)
-    {
-        string combinedString = $"{input.envelopeUuid}::{input.receiverSignature}";
-        byte[] bytes = Encoding.UTF8.GetBytes(combinedString);
-        string base64String = Convert.ToBase64String(bytes);
-
-        return base64String;
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/GdPictureExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/GdPictureExtensions.cs
@@ -1,176 +0,0 @@
-using EnvelopeGenerator.Application.Common.Dto.PSPDFKitInstant;
-using EnvelopeGenerator.Domain.Constants;
-using GdPicture14;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using SixLabors.ImageSharp;
-using System.Drawing;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Interfaces.Model;
-using EnvelopeGenerator.Application.Common.Configurations;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class GdPictureExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="manager"></param>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
-    /// <param name="width"></param>
-    /// <param name="height"></param>
-    /// <param name="page"></param>
-    /// <param name="value"></param>
-    /// <param name="textStyle"></param>
-    public static void AddFormFieldValue(this AnnotationManager manager, double x, double y, double width, double height, int page, string value, ITextStyle textStyle)
-    {
-        manager.SelectPage(page);
-
-        // Add the text annotation
-        var ant = manager.AddTextAnnot((float)x, (float)y, (float)width, (float)height, value);
-
-        // Set the font properties
-        ant.FontName = textStyle.FontName;
-        ant.FontSize = textStyle.FontSize;
-        ant.FontStyle = textStyle.FontStyle;
-
-        manager.SaveAnnotationsToPage();
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="manager"></param>
-    /// <param name="pAnnotation"></param>
-    /// <param name="formFieldValue"></param>
-    /// <param name="options"></param>
-    public static void AddFormFieldValue(this AnnotationManager manager, Annotation pAnnotation, FormFieldValue formFieldValue, PDFBurnerParams options)
-    {
-        var ffIndex = options.GetAnnotationIndex(pAnnotation.EgName);
-
-        // Convert pixels to Inches
-        var oBounds = pAnnotation.Bbox?.Select(points => points.ToInches()).ToList();
-
-        if (oBounds is null || oBounds.Count < 4)
-            return;
-
-        double oX = oBounds[0];
-        double oY = oBounds[1] + options.YOffset * ffIndex + options.TopMargin;
-        double oWidth = oBounds[2];
-        double oHeight = oBounds[3];
-
-        manager.SelectPage(pAnnotation.PageIndex + 1);
-
-        // Add the text annotation
-        var ant = manager.AddTextAnnot((float)oX, (float)oY, (float)oWidth, (float)oHeight, formFieldValue.Value);
-
-        // Set the font properties
-        ant.FontName = options.FontName;
-        ant.FontSize = options.FontSize;
-        ant.FontStyle = options.FontStyle;
-
-        manager.SaveAnnotationsToPage();
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="manager"></param>
-    /// <param name="x"></param>
-    /// <param name="y"></param>
-    /// <param name="width"></param>
-    /// <param name="height"></param>
-    /// <param name="page"></param>
-    /// <param name="base64"></param>
-    public static void AddImageAnnotation(this AnnotationManager manager, double x, double y, double width, double height, int page, string base64)
-    {
-        manager.SelectPage(page);
-        manager.AddEmbeddedImageAnnotFromBase64(base64, (float)x, (float)y, (float)width, (float)height);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="manager"></param>
-    /// <param name="pAnnotation"></param>
-    /// <param name="pAttachments"></param>
-    public static void AddImageAnnotation(this AnnotationManager manager, Annotation pAnnotation, Dictionary<string, Attachment> pAttachments)
-    {
-        var oAttachment = pAttachments
-            .Where(a => a.Key == pAnnotation.ImageAttachmentId)
-            .SingleOrDefault();
-
-        if (oAttachment.Value == null)
-            return;
-
-        // Convert pixels to Inches
-        var oBounds = pAnnotation.Bbox?.Select(post => post.ToInches()).ToList();
-
-        if (oBounds is null || oBounds.Count < 4)
-            return;
-
-        var oX = oBounds[0];
-        var oY = oBounds[1];
-        var oWidth = oBounds[2];
-        var oHeight = oBounds[3];
-
-        manager.SelectPage(pAnnotation.PageIndex + 1);
-        manager.AddEmbeddedImageAnnotFromBase64(oAttachment.Value.Binary, (float)oX, (float)oY, (float)oWidth, (float)oHeight);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="manager"></param>
-    /// <param name="page"></param>
-    /// <param name="value"></param>
-    public static void AddInkAnnotation(this AnnotationManager manager, int page, string value)
-    {
-        var ink = JsonConvert.DeserializeObject<Ink>(value);
-
-        var oSegments = ink?.Lines.Points;
-        var oColor = ColorTranslator.FromHtml(ink?.StrokeColor ?? "#000000");
-        manager.SelectPage(page);
-
-        if (oSegments is null)
-            return;
-
-        foreach (var oSegment in oSegments)
-        {
-            var oPoints = oSegment
-                .Select(points => points.ToPointF())
-                .ToArray();
-
-            manager.AddFreeHandAnnot(oColor, oPoints);
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="manager"></param>
-    /// <param name="pAnnotation"></param>
-    public static void AddInkAnnotation(this AnnotationManager manager, Annotation pAnnotation)
-    {
-        var oSegments = pAnnotation.Lines?.Points;
-        var oColor = ColorTranslator.FromHtml(pAnnotation.StrokeColor ?? "#000000");
-        manager.SelectPage(pAnnotation.PageIndex + 1);
-
-        if (oSegments is null)
-            return;
-
-        foreach (var oSegment in oSegments)
-        {
-            var oPoints = oSegment
-                .Select(points => points.ToPointF())
-                .ToArray();
-
-            manager.AddFreeHandAnnot(oColor, oPoints);
-        }
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/JsonExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/JsonExtensions.cs
@@ -1,18 +0,0 @@
-using System.Text.Json;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class JsonExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="obj"></param>
-    /// <param name="options"></param>
-    /// <returns></returns>
-    public static string ToJson(this object obj, JsonSerializerOptions? options = null)
-        => JsonSerializer.Serialize(obj, options);
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/MathematExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/MathematExtensions.cs
@@ -1,40 +0,0 @@
-using System.Drawing;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class MathematExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="points"></param>
-    /// <returns></returns>
-    public static PointF ToPointF(this List<float> points)
-    {
-        var pointsInch = points.Select(ToInches).ToList();
-        return new PointF(pointsInch[0], pointsInch[1]);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public static double ToInches(this double value)
-    {
-        return value / 72.0;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="value"></param>
-    /// <returns></returns>
-    public static float ToInches(this float value)
-    {
-        return value / 72f;
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
@@ -1,125 +0,0 @@
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Query;
-using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Domain.Interfaces;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class QueryExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <param name="root"></param>
-    /// <param name="query"></param>
-    /// <param name="notnull"></param>
-    /// <returns></returns>
-    /// <exception cref="BadRequestException"></exception>
-    public static IQueryable<TEntity> Where<TEntity>(this IQueryable<TEntity> root, EnvelopeQueryBase query, bool notnull = true)
-        where TEntity : IHasEnvelope
-    {
-        if (query.Id is not null)
-            root = root.Where(e => e.Envelope!.Id == query.Id);
-        else if (query.Uuid is not null)
-            root = root.Where(e => e.Envelope!.Uuid == query.Uuid);
-        else if (notnull)
-            throw new BadRequestException(
-                "Either Envelope Id or Envelope Uuid must be provided in the query."
-            );
-
-        return root;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="root"></param>
-    /// <param name="query"></param>
-    /// <param name="notnull"></param>
-    /// <returns></returns>
-    /// <exception cref="BadRequestException"></exception>
-    public static IQueryable<Envelope> Where(this IQueryable<Envelope> root, EnvelopeQueryBase query, bool notnull = true)
-    {
-        if (query.Id is not null)
-            root = root.Where(e => e.Id == query.Id);
-        else if (query.Uuid is not null)
-            root = root.Where(e => e.Uuid == query.Uuid);
-        else if (notnull)
-            throw new BadRequestException(
-                "Either Envelope Id or Envelope Uuid must be provided in the query."
-            );
-
-        return root;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <param name="root"></param>
-    /// <param name="query"></param>
-    /// <param name="notnull"></param>
-    /// <returns></returns>
-    /// <exception cref="BadRequestException"></exception>
-    public static IQueryable<TEntity> Where<TEntity>(this IQueryable<TEntity> root, ReceiverQueryBase query, bool notnull = true)
-        where TEntity : IHasReceiver
-    {
-        if (query.Id is not null)
-            root = root.Where(e => e.Receiver!.Id == query.Id);
-        else if (query.EmailAddress is not null)
-            root = root.Where(e => e.Receiver!.EmailAddress == query.EmailAddress);
-        else if (query.Signature is not null)
-            root = root.Where(e => e.Receiver!.Signature == query.Signature);
-        else if (notnull)
-            throw new BadRequestException(
-                "Receiver must have at least one identifier (Id, EmailAddress, or Signature)."
-            );
-
-        return root;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="root"></param>
-    /// <param name="query"></param>
-    /// <param name="notnull"></param>
-    /// <returns></returns>
-    /// <exception cref="BadRequestException"></exception>
-    public static IQueryable<Receiver> Where(this IQueryable<Receiver> root, ReceiverQueryBase query, bool notnull = true)
-    {
-        if (query.Id is not null)
-            root = root.Where(e => e.Id == query.Id);
-        else if (query.EmailAddress is not null)
-            root = root.Where(e => e.EmailAddress == query.EmailAddress);
-        else if (query.Signature is not null)
-            root = root.Where(e => e.Signature == query.Signature);
-        else if (notnull)
-            throw new BadRequestException(
-                "Receiver must have at least one identifier (Id, EmailAddress, or Signature)."
-            );
-
-        return root;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TEnvelopeQuery"></typeparam>
-    /// <typeparam name="TReceiverQuery"></typeparam>
-    /// <param name="root"></param>
-    /// <param name="query"></param>
-    /// <param name="notnull"></param>
-    /// <returns></returns>
-    public static IQueryable<TEntity> Where<TEntity, TEnvelopeQuery, TReceiverQuery>(this IQueryable<TEntity> root, EnvelopeReceiverQueryBase<TEnvelopeQuery, TReceiverQuery> query, bool notnull = true)
-        where TEntity : IHasEnvelope, IHasReceiver
-        where TEnvelopeQuery : EnvelopeQueryBase, new()
-        where TReceiverQuery : ReceiverQueryBase, new() 
-        => root.Where(query.Envelope, notnull).Where(query.Receiver, notnull);
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/StringExtension.cs
@@ -1,30 +0,0 @@
-using OtpNet;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// 
-/// </summary>
-public static class StringExtension
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="totp"></param>
-    /// <param name="secret"></param>
-    /// <returns></returns>
-    public static bool IsValidTotp(this string totp, string secret)
-    {
-        var secret_bytes = Base32Encoding.ToBytes(secret);
-        var secret_totp = new Totp(secret_bytes);
-        return secret_totp.VerifyTotp(totp, out _, VerificationWindow.RfcSpecifiedNetworkDelay);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="seperator"></param>
-    /// <param name="values"></param>
-    /// <returns></returns>
-    public static string Join(this IEnumerable<string> values, string seperator) => string.Join(seperator, values);
-}
--- a/EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/TaskExtensions.cs
@@ -1,78 +0,0 @@
-using DigitalData.Core.Exceptions;
-
-namespace EnvelopeGenerator.Application.Common.Extensions;
-
-/// <summary>
-/// Extension methods for tasks
-/// </summary>
-public static class TaskExtensions
-{
-    /// <summary>
-    /// Awaits the specified task and ensures that the result is not <c>null</c>.
-    /// If the result is <c>null</c>, the exception created by factory-method is thrown.
-    /// </summary>
-    /// <typeparam name="T">The type of the result.</typeparam>
-    /// <typeparam name="TException">The type of the exception.</typeparam>
-    /// <param name="task">The task to await.</param>
-    /// <param name="factory">Exception provider</param>
-    /// <returns>The awaited result if not <c>null</c>.</returns>
-    /// <exception>Thrown if the result is <c>null</c>.</exception>
-    public static async Task<T> ThrowIfNull<T, TException>(this Task<T?> task, Func<TException> factory) where TException : Exception
-    {
-        var result = await task;
-        return result ?? throw factory();
-    }
-
-    /// <summary>
-    /// Awaits the specified task and ensures that the result is not <c>empty</c>.
-    /// If the result contains no elements, the exception created by factory-method is thrown.
-    /// </summary>
-    /// <typeparam name="T">The element type of the collection.</typeparam>
-    /// <typeparam name="TException">The type of the exception.</typeparam>
-    /// <param name="task">The task to await.</param>
-    /// <param name="factory">Exception provider</param>
-    /// <returns>The awaited collection if it is not <c>null</c> or empty.</returns>
-    /// <exception cref="NotFoundException">Thrown if the result is <c>null</c> or empty.</exception>
-    public static async Task<IEnumerable<T>> ThrowIfEmpty<T, TException>(this Task<IEnumerable<T>> task, Func<TException> factory) where TException : Exception
-    {
-        var result = await task;
-        return result?.Any() ?? false ? result : throw factory();
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <typeparam name="I"></typeparam>
-    /// <param name="task"></param>
-    /// <param name="act"></param>
-    /// <returns></returns>
-    public static async Task<I> Then<T, I>(this Task<T> task, Func<T, I> act)
-    {
-        var res = await task;
-        return act(res);
-    }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public static class Exceptions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public static NotFoundException NotFound() => new();
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public static BadRequestException BadRequest() => new();
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public static ForbiddenException Forbidden() => new();
-}
--- a/EnvelopeGenerator.Application/Common/Interfaces/Model/ITextStyle.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Model/ITextStyle.cs
@@ -1,27 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Drawing;
-
-namespace EnvelopeGenerator.Application.Common.Interfaces.Model;
-
-/// <summary>
-/// 
-/// </summary>
-public interface ITextStyle
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string FontName { get; set; }
-
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int FontSize { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
-    public FontStyle FontStyle { get; set; }
-}
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeDocumentService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeDocumentService.cs
@@ -1,13 +0,0 @@
-using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
-
-/// <summary>
-/// 
-/// </summary>
-[Obsolete("Use MediatR")]
-public interface IEnvelopeDocumentService : IBasicCRUDService<DocumentDto, Document, int>
-{
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/DocSignedNotification.cs
@@ -1,88 +0,0 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using System.Dynamic;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Instant"></param>
-/// <param name="Structured"></param>
-public record PsPdfKitAnnotation(ExpandoObject Instant, IEnumerable<AnnotationCreateDto> Structured);
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="Original"></param>
-public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeReceiverDto(Original), INotification, ISendMailNotification
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public PsPdfKitAnnotation PsPdfKitAnnotation { get; init; } = null!;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public EmailTemplateType TemplateType => EmailTemplateType.DocumentSigned;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string EmailAddress => Receiver?.EmailAddress
-        ?? throw new InvalidOperationException($"Receiver is null." +
-            $"DocSignedNotification:\n{this.ToJson(Format.Json.ForDiagnostics)}");
-}
-
-/// <summary>
-/// 
-/// </summary>
-public static class DocSignedNotificationExtensions
-{
-    /// <summary>
-    /// Converts an <see cref="EnvelopeReceiverDto"/> to a <see cref="DocSignedNotification"/>.
-    /// </summary>
-    /// <param name="dto">The DTO to convert.</param>
-    /// <param name="psPdfKitAnnotation"></param>
-    /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
-    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, PsPdfKitAnnotation psPdfKitAnnotation)
-        => new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation };
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="dtoTask"></param>
-    /// <param name="psPdfKitAnnotation"></param>
-    /// <returns></returns>
-    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, PsPdfKitAnnotation psPdfKitAnnotation)
-        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { PsPdfKitAnnotation = psPdfKitAnnotation } : null;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="publisher"></param>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public static async Task PublishSafely(this IPublisher publisher, DocSignedNotification notification, CancellationToken cancel = default)
-    {
-        try
-        {
-            await publisher.Publish(notification, cancel);
-        }
-        catch (Exception)
-        {
-            await publisher.Publish(new RemoveSignatureNotification()
-            {
-                EnvelopeId = notification.EnvelopeId,
-                ReceiverId = notification.ReceiverId
-            }, cancel);
-            throw;
-        }
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
@@ -1,34 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class AnnotationHandler : INotificationHandler<DocSignedNotification>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    private readonly IRepository<ElementAnnotation> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public AnnotationHandler(IRepository<ElementAnnotation> repository)
-    {
-        _repo = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task Handle(DocSignedNotification notification, CancellationToken cancel)
-        => _repo.CreateAsync(notification.PsPdfKitAnnotation.Structured, cancel);
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
@@ -1,39 +0,0 @@
-using EnvelopeGenerator.Application.DocStatus.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-using System.Text.Json;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class DocStatusHandler : INotificationHandler<DocSignedNotification>
-{
-    private readonly ISender _sender;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    public DocStatusHandler(ISender sender)
-    {
-        _sender = sender;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
-    {
-        await _sender.Send(new SaveDocStatusCommand()
-        {
-            Envelope = new() { Id = notification.EnvelopeId },
-            Receiver = new() { Id = notification.ReceiverId},
-            Value = JsonSerializer.Serialize(notification.PsPdfKitAnnotation.Instant, Format.Json.ForAnnotations)
-        }, cancel);
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/HistoryHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/HistoryHandler.cs
@@ -1,42 +0,0 @@
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Application.Histories.Commands;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class HistoryHandler : INotificationHandler<DocSignedNotification>
-{
-    private readonly ISender _sender;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    public HistoryHandler(ISender sender)
-    {
-        _sender = sender;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
-    {
-        if (notification.Receiver is null)
-            throw new InvalidOperationException($"Receiver information is missing in the notification. DocSignedNotification:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
-
-        await _sender.Send(new CreateHistoryCommand()
-        {
-            EnvelopeId = notification.EnvelopeId,
-            UserReference = notification.Receiver.EmailAddress,
-            Status = EnvelopeStatus.DocumentSigned,
-        }, cancel);
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
@@ -1,50 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Domain.Entities;
-using Microsoft.Extensions.Options;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="tempRepo"></param>
-    /// <param name="emailOutRepo"></param>
-    /// <param name="mailParamsOptions"></param>
-    /// <param name="dispatcherParamsOptions"></param>
-    public SendSignedMailHandler(IRepository<EmailTemplate> tempRepo, IRepository<EmailOut> emailOutRepo, IOptions<MailParams> mailParamsOptions, IOptions<DispatcherParams> dispatcherParamsOptions) : base(tempRepo, emailOutRepo, mailParamsOptions, dispatcherParamsOptions)
-    {
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="emailOut"></param>
-    protected override void ConfigureEmailOut(DocSignedNotification notification, EmailOut emailOut)
-    {
-        emailOut.ReferenceString = notification.EmailAddress;
-        emailOut.ReferenceId = notification.ReceiverId;
-    }
-
-    /// <summary>
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <returns></returns>
-    protected override Dictionary<string, string> CreatePlaceHolders(DocSignedNotification notification)
-    {
-        var placeHolders = new Dictionary<string, string>()
-        {
-            { "[NAME_RECEIVER]", notification.Name ?? string.Empty },
-            { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
-        };
-
-        return placeHolders;
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveAnnotationHandler.cs
@@ -1,53 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class RemoveAnnotationHandler : INotificationHandler<RemoveSignatureNotification>
-{
-    private readonly IRepository<ElementAnnotation> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public RemoveAnnotationHandler(IRepository<ElementAnnotation> repository)
-    {
-        _repo = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
-    {
-        notification.ThrowIfHasNoFilter();
-        return _repo.DeleteAsync(annots =>
-        {
-            // envelope ID filter
-            if (notification.EnvelopeId is int envelopeId)
-                annots = annots.Where(annot => annot.Element!.Document.EnvelopeId == envelopeId);
-
-            // envelope UUID filter
-            if (notification.EnvelopeUuid is string envelopeUuid)
-                annots = annots.Where(annot => annot.Element!.Document.Envelope!.Uuid == envelopeUuid);
-
-            // receiver ID
-            if (notification.ReceiverId is int receiverId)
-                annots = annots.Where(annot => annot.Element!.ReceiverId == receiverId);
-
-            // receiver signature
-            if (notification.ReceiverSignature is string receiverSignature)
-                annots = annots.Where(annot => annot.Element!.Receiver!.Signature == receiverSignature);
-
-            return annots;
-        }, cancel);
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocResult.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocResult.cs
@@ -1,47 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class RemoveDocResult : INotificationHandler<RemoveSignatureNotification>
-{
-    private readonly IRepository<Envelope> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public RemoveDocResult(IRepository<Envelope> repository)
-    {
-        _repo = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
-    {
-        if(notification.EnvelopeId is null && notification.EnvelopeUuid is null)
-            return Task.CompletedTask;
-
-        return _repo.UpdateAsync(
-            envelope => envelope.DocResult = null,
-            query => {
-                if (notification.EnvelopeId is int envelopeId)
-                    query = query.Where(envelope => envelope.Id == envelopeId);
-
-                if (notification.EnvelopeUuid is string uuid)
-                    query = query.Where(envelope => envelope.Uuid == uuid);
-
-                return query;
-            }, cancel);
-
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveDocStatusHandler.cs
@@ -1,53 +0,0 @@
-using AngleSharp.Html;
-using DigitalData.Core.Abstraction.Application.Repository;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class RemoveDocStatusHandler : INotificationHandler<RemoveSignatureNotification>
-{
-    private readonly IRepository<Domain.Entities.DocumentStatus> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public RemoveDocStatusHandler(IRepository<Domain.Entities.DocumentStatus> repository)
-    {
-        _repo = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
-    {
-        notification.ThrowIfHasNoFilter();
-        return _repo.DeleteAsync(statuses =>
-        {
-            // envelope ID filter
-            if (notification.EnvelopeId is int envelopeId)
-                statuses = statuses.Where(status => status.EnvelopeId == envelopeId);
-
-            // envelope UUID filter
-            if (notification.EnvelopeUuid is string envelopeUuid)
-                statuses = statuses.Where(status => status.Envelope!.Uuid == envelopeUuid);
-
-            // receiver Id filter
-            if (notification.ReceiverId is int receiverId)
-                statuses = statuses.Where(status => status.ReceiverId == receiverId);
-
-            // receiver signature filter
-            if (notification.ReceiverSignature is string receiverSignature)
-                statuses = statuses.Where(status => status.Receiver!.Signature == receiverSignature);
-
-            return statuses;
-        }, cancel);
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/Handlers/RemoveHistoryHandler.cs
@@ -1,56 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Domain.Constants;
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature.Handlers;
-
-/// <summary>
-/// 
-/// </summary>
-public class RemoveHistoryHandler : INotificationHandler<RemoveSignatureNotification>
-{
-    private readonly IRepository<Domain.Entities.History> _repo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repository"></param>
-    public RemoveHistoryHandler(IRepository<Domain.Entities.History> repository)
-    {
-        _repo = repository;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public Task Handle(RemoveSignatureNotification notification, CancellationToken cancel)
-    {
-        notification.ThrowIfHasNoFilter();
-        return _repo.DeleteAsync(hists =>
-        {
-            hists = hists.Where(hist => hist.Status == EnvelopeStatus.DocumentSigned);
-
-            // envelope ID filter
-            if (notification.EnvelopeId is int envelopeId)
-                hists = hists.Where(hist => hist.EnvelopeId == envelopeId);
-
-            // envelope UUID filter
-            if (notification.EnvelopeUuid is string envelopeUuid)
-                hists = hists.Where(hist => hist.Envelope!.Uuid == envelopeUuid);
-
-            // receiver ID filter
-            if (notification.ReceiverId is int receiverId)
-                hists = hists.Where(hist => hist.Receiver!.Id == receiverId);
-
-            // receiver signature filter
-            if (notification.ReceiverSignature is string receiverSignature)
-                hists = hists.Where(hist => hist.Receiver!.Signature == receiverSignature);
-
-            return hists;
-        }, cancel);
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/RemoveSignatureNotification.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/RemoveSignature/RemoveSignatureNotification.cs
@@ -1,37 +0,0 @@
-using MediatR;
-
-namespace EnvelopeGenerator.Application.Common.Notifications.RemoveSignature;
-
-/// <summary>
-/// 
-/// </summary>
-/// <param name="EnvelopeId"></param>
-/// <param name="ReceiverId"></param>
-/// <param name="EnvelopeUuid"></param>
-/// <param name="ReceiverSignature"></param>
-public record RemoveSignatureNotification(
-    int? EnvelopeId = null,
-    int? ReceiverId = null,
-    string? EnvelopeUuid = null,
-    string? ReceiverSignature = null
-    ) : INotification
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool HasFilter => 
-        EnvelopeId is not null 
-        || ReceiverId is not null 
-        || EnvelopeUuid is not null 
-        || ReceiverSignature is not null;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <exception cref="InvalidOperationException"></exception>
-    public void ThrowIfHasNoFilter()
-    {
-        if (!HasFilter)
-            throw new InvalidOperationException("At least one filter parameter must be provided.");
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs
@@ -1,135 +0,0 @@
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
-using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Common.Extensions;
-using EnvelopeGenerator.Domain.Constants;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-
-namespace EnvelopeGenerator.Application.Common.Notifications;
-
-/// <summary>
-/// 
-/// </summary>
-public interface ISendMailNotification : INotification
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public EmailTemplateType TemplateType { get; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public string EmailAddress { get; }
-}
-
-/// <summary>
-/// 
-/// </summary>
-public abstract class SendMailHandler<TNotification> : INotificationHandler<TNotification>
-    where TNotification : ISendMailNotification
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    protected readonly IRepository<EmailTemplate> TempRepo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    protected readonly IRepository<EmailOut> EmailOutRepo;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    protected abstract Dictionary<string, string> CreatePlaceHolders(TNotification notification);
-
-    /// <summary>
-    ///{ "[MESSAGE]", notification.Message },<br/>
-    ///{ "[DOCUMENT_ACCESS_CODE]", notification.ReceiverAccessCode },<br/>
-    ///{ "[REASON]", pReason }<br/>
-    ///{ "[NAME_SENDER]", notification.Envelope.User?.FullName},<br/>
-    ///{ "[NAME_PORTAL]", DispatcherParams. },<br/>
-    ///{ "[SIGNATURE_TYPE]", "signieren" },<br/>
-    ///{ "[LINK_TO_DOCUMENT]", notification.SignatureLink },<br/>
-    ///{ "[LINK_TO_DOCUMENT_TEXT]", $"{notification.SignatureLink.Truncate(40)}.." },
-    /// </summary>
-    protected readonly MailParams MailParams;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    protected readonly DispatcherParams DispatcherParams;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="emailOut"></param>
-    protected abstract void ConfigureEmailOut(TNotification notification, EmailOut emailOut);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="tempRepo"></param>
-    /// <param name="emailOutRepo"></param>
-    /// <param name="mailParamsOptions"></param>
-    /// <param name="dispatcherParamsOptions"></param>
-    protected SendMailHandler(IRepository<EmailTemplate> tempRepo, IRepository<EmailOut> emailOutRepo, IOptions<MailParams> mailParamsOptions, IOptions<DispatcherParams> dispatcherParamsOptions)
-    {
-        TempRepo = tempRepo;
-        EmailOutRepo = emailOutRepo;
-        MailParams = mailParamsOptions.Value;
-        DispatcherParams = dispatcherParamsOptions.Value;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="notification"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public virtual async Task Handle(TNotification notification, CancellationToken cancel)
-    {
-        var placeHolders = CreatePlaceHolders(notification);
-
-        var temp = await TempRepo
-            .Where(x => x.Name == notification.TemplateType.ToString())
-            .SingleOrDefaultAsync(cancel)
-                ?? throw new InvalidOperationException($"Receiver information is missing in the notification." +
-                $"{typeof(TNotification)}:\n {notification.ToJson(Format.Json.ForDiagnostics)}");
-
-        temp.Subject = ReplacePlaceHolders(temp.Subject, placeHolders, MailParams.Placeholders);
-
-        temp.Body = ReplacePlaceHolders(temp.Body, placeHolders, MailParams.Placeholders);
-
-        var emailOut = new EmailOut
-        {
-            EmailAddress = notification.EmailAddress,
-            EmailBody = temp.Body,
-            EmailSubj = temp.Subject,
-            AddedWhen = DateTime.UtcNow,
-            AddedWho = DispatcherParams.AddedWho,
-            SendingProfile = DispatcherParams.SendingProfile,
-            ReminderTypeId = DispatcherParams.ReminderTypeId,
-            EmailAttmt1 = DispatcherParams.EmailAttmt1,
-            WfId = (int)EnvelopeStatus.MessageConfirmationSent,
-            
-        };
-        ConfigureEmailOut(notification, emailOut);
-        await EmailOutRepo.CreateAsync(emailOut, cancel);
-    }
-
-    private static string ReplacePlaceHolders(string text, params Dictionary<string, string>[] placeHoldersList)
-    {
-        foreach (var placeHolders in placeHoldersList)
-            foreach (var ph in placeHolders)
-                text = text.Replace(ph.Key, ph.Value);
-        return text;
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/EnvelopeQueryBase.cs
@@ -1,17 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Query;
-
-/// <summary>
-/// Repräsentiert eine Abfrage für Umschläge.
-/// </summary>
-public record EnvelopeQueryBase
-{
-    /// <summary>
-    /// Die eindeutige Kennung des Umschlags.
-    /// </summary>
-    public virtual int? Id { get; set; }
-
-    /// <summary>
-    /// Die universell eindeutige Kennung des Umschlags.
-    /// </summary>
-    public virtual string? Uuid { get; set; }
-}
--- a/EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/EnvelopeReceiverQueryBase.cs
@@ -1,62 +0,0 @@
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Extensions;
-
-namespace EnvelopeGenerator.Application.Common.Query;
-
-/// <summary>
-/// 
-/// </summary>
-public record EnvelopeReceiverQueryBase : EnvelopeReceiverQueryBase<EnvelopeQueryBase, ReceiverQueryBase>;
-
-/// <summary>
-/// 
-/// </summary>
-/// <typeparam name="TEnvelopeQuery"></typeparam>
-/// <typeparam name="TReceiverQuery"></typeparam>
-public record EnvelopeReceiverQueryBase<TEnvelopeQuery, TReceiverQuery>
-    where TEnvelopeQuery : EnvelopeQueryBase, new()
-    where TReceiverQuery : ReceiverQueryBase, new()
-{
-    private string? _key;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public virtual string? Key
-    {
-        get => _key;
-        set
-        {
-            if (value is null)
-            {
-                _key = null;
-                return;
-            }
-
-            (string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
-            if (string.IsNullOrEmpty(EnvelopeUuid) || string.IsNullOrEmpty(ReceiverSignature))
-                throw new BadRequestException("Der EnvelopeReceiverKey muss ein gültiger Base64-kodierter String sein, der die EnvelopeUuid und die ReceiverSignature enthält.");
-
-            Envelope = new TEnvelopeQuery()
-            {
-                Uuid = EnvelopeUuid
-            };
-            Receiver = new TReceiverQuery()
-            {
-                Signature = ReceiverSignature
-            };
-            _key = value;
-        }
-    }
-
-    /// <summary>
-    /// Repräsentiert eine Abfrage für Umschläge.
-    /// </summary>
-    public virtual TEnvelopeQuery Envelope { get; set; } = new();
-
-    /// <summary>
-    /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
-    /// um spezifische Informationen über einen Empfänger abzurufen.
-    /// </summary>
-    public virtual TReceiverQuery Receiver { get; set; } = new();
-}
--- a/EnvelopeGenerator.Application/Common/Query/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Query/MappingProfile.cs
@@ -1,20 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.Common.Query;
-
-/// <summary>
-/// 
-/// </summary>
-public class MappingProfile : Profile
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public MappingProfile()
-    {
-        CreateMap<EnvelopeQueryBase, Envelope>();
-        CreateMap<ReceiverQueryBase, Receiver>();
-        CreateMap<EnvelopeReceiverQueryBase, EnvelopeReceiver>();
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
@@ -1,33 +0,0 @@
-namespace EnvelopeGenerator.Application.Common.Query;
-
-/// <summary>
-/// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
-/// um spezifische Informationen über einen Empfänger abzurufen.
-/// </summary>
-public record ReceiverQueryBase
-{
-    /// <summary>
-    /// ID des Empfängers
-    /// </summary>
-    public virtual int? Id { get; set; }
-
-    /// <summary>
-    /// E-Mail Adresse des Empfängers
-    /// </summary>
-    public virtual string? EmailAddress { get; set; }
-
-    /// <summary>
-    /// Eindeutige Signatur des Empfängers
-    /// </summary>
-    public virtual string? Signature { get; set; }
-
-    /// <summary>
-    /// Checks whether any of the specified query criteria have a value.
-    /// </summary>
-    /// <remarks>
-    /// This property returns <c>true</c> if at least one of the fields 
-    /// <see cref="Id"/>, <see cref="EmailAddress"/>, or <see cref="Signature"/> is not null.
-    /// <para>Usage example: The query can be executed only if at least one criterion is specified.</para>
-    /// </remarks>
-    public bool HasAnyCriteria => Id is not null || EmailAddress is not null || Signature is not null;
-}
--- a/EnvelopeGenerator.Application/Configs/DefaultReadConfigQuery.cs
+++ b/EnvelopeGenerator.Application/Configs/DefaultReadConfigQuery.cs
@@ -1,87 +0,0 @@
-using AutoMapper;
-using DigitalData.Core.Abstraction.Application.Repository;
-using DigitalData.Core.Exceptions;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Entities;
-using MediatR;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace EnvelopeGenerator.Application.Configs;
-
-/// <summary>
-/// 
-/// </summary>
-public class DefaultReadConfigQuery : IRequest<ConfigDto>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public static readonly Guid MemoryCacheKey = Guid.NewGuid();
-}
-
-/// <summary>
-/// 
-/// </summary>
-public static class DefaultReadConfigQueryExtensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="sender"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public static Task<ConfigDto> ReadDefaultConfigAsync(this ISender sender, CancellationToken cancel = default) 
-        => sender.Send(new DefaultReadConfigQuery(), cancel);
-}
-
-/// <summary>
-/// 
-/// </summary>
-public class DefaultReadConfigQueryHandler : IRequestHandler<DefaultReadConfigQuery, ConfigDto>
-{
-    private readonly IRepository<Config> _repo;
-
-    private readonly IMapper _mapper;
-
-    private readonly IMemoryCache _cache;
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="repo"></param>
-    /// <param name="mapper"></param>
-    /// <param name="cache"></param>
-    public DefaultReadConfigQueryHandler(IRepository<Config> repo, IMapper mapper, IMemoryCache cache)
-    {
-        _repo = repo;
-        _mapper = mapper;
-        _cache = cache;
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public async Task<ConfigDto> Handle(DefaultReadConfigQuery request, CancellationToken cancel)
-    {
-        var config = await _cache.GetOrCreateAsync(DefaultReadConfigQuery.MemoryCacheKey, async entry =>
-        {
-            entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5);
-            var configs = await _repo.GetAllAsync(cancel);
-            var defaultConfig = configs.FirstOrDefault();
-            var defaultConfigDto = _mapper.Map<ConfigDto>(defaultConfig);
-            return defaultConfigDto;
-        });
-
-        if(config is null)
-        {
-            _cache.Remove(DefaultReadConfigQuery.MemoryCacheKey);
-            throw new NotFoundException("No configuration record is found.");
-        }
-
-        return config;
-    }
-}
--- a/EnvelopeGenerator.Application/Common/Configurations/AuthenticatorParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/AuthenticatorParams.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Configurations;
+namespace EnvelopeGenerator.Application.Configurations;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Configurations/DbTriggerParams.cs
+++ b/EnvelopeGenerator.Application/Configurations/DbTriggerParams.cs
@@ -0,0 +1,8 @@
+namespace EnvelopeGenerator.Application.Configurations;
+
+/// <summary>
+/// 
+/// </summary>
+public class DbTriggerParams : Dictionary<string, ICollection<string>>
+{
+}
--- a/EnvelopeGenerator.Application/Common/Configurations/DispatcherParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/DispatcherParams.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Configurations;
+namespace EnvelopeGenerator.Application.Configurations;

 /// <summary>
 /// 
@@ -23,5 +23,5 @@ public class DispatcherParams
    /// <summary>
    /// Default value is string.Empty
    /// </summary>
-    public string? EmailAttmt1 { get; init; } = null;
+    public string EmailAttmt1 { get; init; } = string.Empty;
 }
--- a/EnvelopeGenerator.Application/Common/Configurations/GtxMessagingParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/GtxMessagingParams.cs
@@ -1,5 +1,5 @@
 using DigitalData.Core.Client.Interface;
-namespace EnvelopeGenerator.Application.Common.Configurations;
+namespace EnvelopeGenerator.Application.Configurations;

 /// <summary>
 /// https://www.gtx-messaging.com/en/api-docs/sms-rest-api/
--- a/EnvelopeGenerator.Application/Common/Configurations/MailParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/MailParams.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Configurations;
+namespace EnvelopeGenerator.Application.Configurations;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Configurations/TotpSmsParams.cs
+++ b/EnvelopeGenerator.Application/Common/Configurations/TotpSmsParams.cs
@@ -1,7 +1,7 @@
 using OtpNet;
 using System.Globalization;

-namespace EnvelopeGenerator.Application.Common.Configurations;
+namespace EnvelopeGenerator.Application.Configurations;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IConfigRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IConfigRepository.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentReceiverElementRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentReceiverElementRepository.cs
@@ -1,11 +1,11 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IDocumentReceiverElementRepository : ICRUDRepository<Signature, int>
+public interface IDocumentReceiverElementRepository : ICRUDRepository<DocumentReceiverElement, int>
 {
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentStatusRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IDocumentStatusRepository.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEmailTemplateRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEmailTemplateRepository.cs
@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Domain.Constants;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs
+++ b/EnvelopeGenerator.Application/Contracts/Repositories/IEnvelopeCertificateRepository.cs
@@ -0,0 +1,12 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Repositories;
+
+/// <summary>
+/// 
+/// </summary>
+[Obsolete("Use Read-method returning IReadQuery<TEntity> instead.")]
+public interface IEnvelopeCertificateRepository : ICRUDRepository<EnvelopeCertificate, int>
+{
+}
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeDocumentRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeDocumentRepository.cs
@@ -1,12 +1,12 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IEnvelopeDocumentRepository : ICRUDRepository<Document, int>
+public interface IEnvelopeDocumentRepository : ICRUDRepository<EnvelopeDocument, int>
 {
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeHistoryRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeHistoryRepository.cs
@@ -1,14 +1,14 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use IRepository")]
-public interface IEnvelopeHistoryRepository : ICRUDRepository<History, long>
+public interface IEnvelopeHistoryRepository : ICRUDRepository<EnvelopeHistory, long>
 {
    /// <summary>
    /// 
@@ -17,7 +17,7 @@ public interface IEnvelopeHistoryRepository : ICRUDRepository<History, long>
    /// <param name="userReference"></param>
    /// <param name="status"></param>
    /// <returns></returns>
-    Task<int> CountAsync(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null);
+    Task<int> CountAsync(int? envelopeId = null, string? userReference = null, Constants.EnvelopeStatus? status = null);

    /// <summary>
    /// 
@@ -28,5 +28,5 @@ public interface IEnvelopeHistoryRepository : ICRUDRepository<History, long>
    /// <param name="withSender"></param>
    /// <param name="withReceiver"></param>
    /// <returns></returns>
-    Task<IEnumerable<History>> ReadAsync(int? envelopeId = null, string? userReference = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
+    Task<IEnumerable<EnvelopeHistory>> ReadAsync(int? envelopeId = null, string? userReference = null, Constants.EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverReadOnlyRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverReadOnlyRepository.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
@@ -1,9 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
@@ -85,7 +83,7 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver,
    /// <param name="max_status"></param>
    /// <param name="ignore_statuses"></param>
    /// <returns></returns>
-    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, params int[] ignore_statuses);

    /// <summary>
    /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeRepository.cs
@@ -1,8 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
-using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
@@ -39,5 +38,5 @@ public interface IEnvelopeRepository : ICRUDRepository<Envelope, int>
    /// <param name="max_status"></param>
    /// <param name="ignore_statuses"></param>
    /// <returns></returns>
-    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
+    Task<IEnumerable<Envelope>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IEnvelopeTypeRepository.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IReceiverRepository.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Repositories/IReceiverRepository.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Repositories;
+namespace EnvelopeGenerator.Application.Contracts.Repositories;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IDocumentExecutor.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IDocumentExecutor.cs
@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// 
@@ -14,5 +14,5 @@ public interface IDocumentExecutor
    /// <param name="envelope_uuid"></param>
    /// <param name="cancellation"></param>
    /// <returns></returns>
-    Task<Document> CreateDocumentAsync(string base64, string envelope_uuid, CancellationToken cancellation = default);
+    Task<EnvelopeDocument> CreateDocumentAsync(string base64, string envelope_uuid, CancellationToken cancellation = default);
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeExecutor.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeExecutor.cs
@@ -1,7 +1,7 @@
 using Dapper;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IEnvelopeReceiverExecutor.cs
@@ -1,6 +1,6 @@
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IQuery.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/IQuery.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// Provides methods for executing common queries on a given entity type.
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQL.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQL.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// Represents a raw SQL query contract.
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutor.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutor.cs
@@ -1,4 +1,4 @@
-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// Defines methods for executing raw SQL queries or custom SQL query classes and returning query executors for further operations.
--- a/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/SQLExecutor/ISQLExecutorBaseEntity.cs
@@ -1,6 +1,6 @@
 using Dapper;

-namespace EnvelopeGenerator.Application.Common.Interfaces.SQLExecutor;
+namespace EnvelopeGenerator.Application.Contracts.SQLExecutor;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IAuthenticator.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IAuthenticator.cs
@@ -1,6 +1,6 @@
 using OtpNet;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IConfigService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IConfigService.cs
@@ -1,9 +1,9 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentReceiverElementService.cs
@@ -1,13 +1,13 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IDocumentReceiverElementService : IBasicCRUDService<SignatureDto, Signature, int>
+public interface IDocumentReceiverElementService : IBasicCRUDService<DocumentReceiverElementDto, DocumentReceiverElement, int>
 {
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentStatusService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IDocumentStatusService.cs
@@ -1,7 +1,7 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEmailTemplateService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEmailTemplateService.cs
@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Domain.Constants;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs
+++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeCertificateService.cs
@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstraction.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+/// <summary>
+/// 
+/// </summary>
+[Obsolete("Use MediatR")]
+public interface IEnvelopeCertificateService : IBasicCRUDService<EnvelopeCertificateDto, EnvelopeCertificate, int>
+{
+}
--- a/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs
+++ b/EnvelopeGenerator.Application/Contracts/Services/IEnvelopeDocumentService.cs
@@ -0,0 +1,13 @@
+using DigitalData.Core.Abstraction.Application;
+using EnvelopeGenerator.Application.DTOs;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Contracts.Services;
+
+/// <summary>
+/// 
+/// </summary>
+[Obsolete("Use MediatR")]
+public interface IEnvelopeDocumentService : IBasicCRUDService<EnvelopeDocumentDto, EnvelopeDocument, int>
+{
+}
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeHistoryService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeHistoryService.cs
@@ -1,17 +1,17 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.History;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;
+using static EnvelopeGenerator.Domain.Constants;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IEnvelopeHistoryService : ICRUDService<HistoryCreateDto, HistoryDto, History, long>
+public interface IEnvelopeHistoryService : ICRUDService<EnvelopeHistoryCreateDto, EnvelopeHistoryDto, EnvelopeHistory, long>
 {
    /// <summary>
    /// 
@@ -56,7 +56,7 @@ public interface IEnvelopeHistoryService : ICRUDService<HistoryCreateDto, Histor
    /// <param name="withSender"></param>
    /// <param name="withReceiver"></param>
    /// <returns></returns>
-    Task<IEnumerable<HistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);
+    Task<IEnumerable<EnvelopeHistoryDto>> ReadAsync(int? envelopeId = null, string? userReference = null, ReferenceType? referenceType = null, EnvelopeStatus? status = null, bool withSender = false, bool withReceiver = false);

    /// <summary>
    /// 
@@ -64,14 +64,14 @@ public interface IEnvelopeHistoryService : ICRUDService<HistoryCreateDto, Histor
    /// <param name="envelopeId"></param>
    /// <param name="userReference"></param>
    /// <returns></returns>
-    Task<IEnumerable<HistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);
+    Task<IEnumerable<EnvelopeHistoryDto>> ReadRejectedAsync(int envelopeId, string? userReference = null);

    /// <summary>
    /// 
    /// </summary>
    /// <param name="envelopeId"></param>
    /// <returns></returns>
-    Task<IEnumerable<ReceiverDto>> ReadRejectingReceivers(int envelopeId);
+    Task<IEnumerable<ReceiverReadDto>> ReadRejectingReceivers(int envelopeId);

    /// <summary>
    /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeMailService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeMailService.cs
@@ -1,10 +1,10 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Domain;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
@@ -19,7 +19,7 @@ public interface IEnvelopeMailService : IEmailOutService
    /// <param name="tempType"></param>
    /// <param name="optionalPlaceholders"></param>
    /// <returns></returns>
-    Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);
+    Task<DataResult<int>> SendAsync(EnvelopeReceiverDto envelopeReceiverDto, Constants.EmailTemplateType tempType, Dictionary<string, object>? optionalPlaceholders = null);

    /// <summary>
    /// 
@@ -35,4 +35,11 @@ public interface IEnvelopeMailService : IEmailOutService
    /// <param name="envelopeReceiverDto"></param>
    /// <returns></returns>
    Task<DataResult<int>> SendAccessCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="envelopeReceiverDto"></param>
+    /// <returns></returns>
+    Task<DataResult<int>> SendTFAQrCodeAsync(EnvelopeReceiverDto envelopeReceiverDto);
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverReadOnlyService.cs
@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeReceiverService.cs
@@ -1,16 +1,13 @@
 using CommandDotNet;
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;
 using EnvelopeGenerator.Application.Envelopes;
-using EnvelopeGenerator.Application.Envelopes.Queries;
-using EnvelopeGenerator.Application.Receivers.Queries;
-using EnvelopeGenerator.Domain;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.Receivers.Queries.Read;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
@@ -123,7 +120,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
    /// <param name="receiverQuery"></param>
    /// <param name="ignore_statuses"></param>
    /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, int? min_status = null, int? max_status = null, EnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params int[] ignore_statuses);

    /// <summary>
    /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeService.cs
@@ -1,10 +1,9 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
@@ -41,5 +40,5 @@ public interface IEnvelopeService : IBasicCRUDService<EnvelopeDto, Envelope, int
    /// <param name="max_status"></param>
    /// <param name="ignore_statuses"></param>
    /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeDto>>> ReadByUserAsync(int userId, int? min_status = null, int? max_status = null, params int[] ignore_statuses);
 }
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeSmsHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeSmsHandler.cs
@@ -1,7 +1,7 @@
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.Messaging;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IEnvelopeTypeService.cs
@@ -1,8 +1,8 @@
 using DigitalData.Core.Abstraction.Application;
-using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.DTOs;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/IReceiverService.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/IReceiverService.cs
@@ -1,16 +1,15 @@
 using DigitalData.Core.Abstraction.Application;
 using DigitalData.Core.Abstraction.Application.DTO;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Application.Receivers.Commands;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 /// <summary>
 /// 
 /// </summary>
 [Obsolete("Use MediatR")]
-public interface IReceiverService : ICRUDService<CreateReceiverCommand, ReceiverDto, Receiver, int>
+public interface IReceiverService : ICRUDService<ReceiverCreateDto, ReceiverReadDto, Receiver, int>
 {
    /// <summary>
    /// 
@@ -18,7 +17,7 @@ public interface IReceiverService : ICRUDService<CreateReceiverCommand, Receiver
    /// <param name="emailAddress"></param>
    /// <param name="signature"></param>
    /// <returns></returns>
-    Task<DataResult<ReceiverDto>> ReadByAsync(string? emailAddress = null, string? signature = null);
+    Task<DataResult<ReceiverReadDto>> ReadByAsync(string? emailAddress = null, string? signature = null);

    /// <summary>
    /// 
--- a/EnvelopeGenerator.Application/Common/Interfaces/Services/ISmsSender.cs
+++ b/EnvelopeGenerator.Application/Common/Interfaces/Services/ISmsSender.cs
@@ -1,6 +1,6 @@
-using EnvelopeGenerator.Application.Common.Dto.Messaging;
+using EnvelopeGenerator.Application.DTOs.Messaging;

-namespace EnvelopeGenerator.Application.Common.Interfaces.Services;
+namespace EnvelopeGenerator.Application.Contracts.Services;

 //TODO: move to DigitalData.Core
 /// <summary>
--- a/EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/ConfigDto.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// Data Transfer Object representing configuration settings.
--- a/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/DocumentReceiverElementDto.cs
@@ -1,13 +1,12 @@
-using EnvelopeGenerator.Domain.Interfaces;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// Data Transfer Object representing a positioned element assigned to a document receiver.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class SignatureDto : ISignature
+public class DocumentReceiverElementDto
 {
    /// <summary>
    /// Gets or sets the unique identifier of the element.
@@ -87,10 +86,10 @@ public class SignatureDto : ISignature
    /// <summary>
    /// Gets or sets the top position of the element (in layout terms).
    /// </summary>
-    public double Top => Y;
+    public double Top { get; set; }

    /// <summary>
    /// Gets or sets the left position of the element (in layout terms).
    /// </summary>
-    public double Left => X;
+    public double Left { get; set; }
 }
--- a/EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/DocumentStatusDto.cs
@@ -1,7 +1,6 @@
-using EnvelopeGenerator.Domain.Constants;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// Data Transfer Object representing the status of a document for a specific receiver.
@@ -27,7 +26,7 @@ public class DocumentStatusDto
    /// <summary>
    /// Gets or sets the current status code.
    /// </summary>
-    public EnvelopeStatus Status { get; set; }
+    public int Status { get; set; }

    /// <summary>
    /// Gets or sets the timestamp when the status was changed.
--- a/EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EmailTemplateDto.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto
+namespace EnvelopeGenerator.Application.DTOs
 {
    /// <summary>
    /// 
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeCertificateDto.cs
@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.DTOs;
+
+/// <summary>
+/// Data Transfer Object representing certificate information for an envelope.
+/// </summary>
+[ApiExplorerSettings(IgnoreApi = true)]
+public class EnvelopeCertificateDto
+{
+    /// <summary>
+    /// Gets the unique identifier of the certificate.
+    /// </summary>
+    public int Id { get; init; }
+
+    /// <summary>
+    /// Gets the envelope ID associated with the certificate.
+    /// </summary>
+    public int EnvelopeId { get; init; }
+
+    /// <summary>
+    /// Gets the UUID of the envelope.
+    /// </summary>
+    public string EnvelopeUuid { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the subject of the envelope.
+    /// </summary>
+    public string EnvelopeSubject { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the ID of the creator of the envelope.
+    /// </summary>
+    public int CreatorId { get; init; }
+
+    /// <summary>
+    /// Gets the name of the creator.
+    /// </summary>
+    public string CreatorName { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the email address of the creator.
+    /// </summary>
+    public string CreatorEmail { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the current status of the envelope.
+    /// </summary>
+    public int EnvelopeStatus { get; init; }
+}
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDocumentDto.cs
@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// Data Transfer Object representing a document within an envelope, including optional binary data and form elements.
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public class DocumentDto
+public class EnvelopeDocumentDto
 {
    /// <summary>
    /// Gets or sets the unique identifier of the document.
@@ -31,5 +31,5 @@ public class DocumentDto
    /// <summary>
    /// Gets or sets the collection of elements associated with the document for receiver interactions, if any.
    /// </summary>
-    public IEnumerable<SignatureDto>? Elements { get; set; }
+    public IEnumerable<DocumentReceiverElementDto>? Elements { get; set; }
 }
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
@@ -1,10 +1,9 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// 
@@ -25,7 +24,7 @@ public record EnvelopeDto
    /// <summary>
    /// 
    /// </summary>
-    public required EnvelopeStatus Status { get; set; }
+    public int Status { get; set; }

    /// <summary>
    /// Default value is string.Empty
@@ -117,5 +116,5 @@ public record EnvelopeDto
    /// <summary>
    /// 
    /// </summary>
-    public IEnumerable<DocumentDto>? Documents { get; set; }
+    public IEnumerable<EnvelopeDocumentDto>? Documents { get; set; }
 }
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryCreateDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryCreateDto.cs
@@ -1,9 +1,11 @@
-namespace EnvelopeGenerator.Application.Common.Dto.History;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory;

 /// <summary>
 /// Data Transfer Object for creating a new envelope history record.
 /// </summary>
-public class HistoryCreateDto
+public class EnvelopeHistoryCreateDto
 {
    /// <summary>
    /// Gets or sets the identifier of the envelope.
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeHistory/EnvelopeHistoryDto.cs
@@ -1,13 +1,13 @@
 using DigitalData.UserManager.Application.DTOs.User;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using static EnvelopeGenerator.Domain.Constants;

-namespace EnvelopeGenerator.Application.Common.Dto.History;
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeHistory;

 /// <summary>
 /// Data Transfer Object representing the history of an envelope, including status, sender, receiver, and related metadata.
 /// </summary>
-public record HistoryDto
+public record EnvelopeHistoryDto
 {
    /// <summary>
    /// Unique identifier for the envelope history entry.
@@ -25,19 +25,9 @@ public record HistoryDto
    public required string UserReference { get; set; }

    /// <summary>
-    /// Include code of the envelope at this history point.
+    /// Status code of the envelope at this history point.
    /// </summary>
-    public EnvelopeStatus Status { get; set; }
-
-    /// <summary>
-    /// Type of reference for this history entry.
-    /// </summary>
-    public ReferenceType ReferenceType => ((int)Status).ToString().FirstOrDefault() switch
-    {
-        '1' => ReferenceType.Sender,
-        '2' => ReferenceType.Receiver,
-        _ => ReferenceType.System,
-    };
+    public int Status { get; set; }

    /// <summary>
    /// Human-readable name of the status.
@@ -62,7 +52,12 @@ public record HistoryDto
    /// <summary>
    /// Information about the receiver associated with this history entry.
    /// </summary>
-    public ReceiverDto? Receiver { get; set; }
+    public ReceiverReadDto? Receiver { get; set; }
+
+    /// <summary>
+    /// Type of reference for this history entry.
+    /// </summary>
+    public ReferenceType ReferenceType { get; set; }

    /// <summary>
    /// Optional comment related to this history entry.
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverDto.cs
@@ -1,25 +1,14 @@
 using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;

 /// <summary>
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeReceiverDto
+public record EnvelopeReceiverBasicDto
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    public EnvelopeDto? Envelope { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReceiverDto? Receiver { get; set; }
-
    /// <summary>
    /// 
    /// </summary>
--- a/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverDto.cs
+++ b/EnvelopeGenerator.Application/DTOs/EnvelopeReceiver/EnvelopeReceiverDto.cs
@@ -0,0 +1,22 @@
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using Microsoft.AspNetCore.Mvc;
+
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+
+/// <summary>
+/// 
+/// </summary>
+
+[ApiExplorerSettings(IgnoreApi = true)]
+public record EnvelopeReceiverDto() : EnvelopeReceiverBasicDto()
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public EnvelopeDto? Envelope { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ReceiverReadDto? Receiver { get; set; }
+}
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiver/EnvelopeReceiverSecretDto.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyCreateDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyCreateDto.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;

-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;

 /// <summary>
 /// 
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyDto.cs
@@ -1,8 +1,7 @@
-using EnvelopeGenerator.Application.Common.Dto;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
+using EnvelopeGenerator.Application.DTOs.Receiver;
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;

 /// <summary>
 /// Represents a read-only Data Transfer Object (DTO) for an envelope receiver.
@@ -60,5 +59,5 @@ public class EnvelopeReceiverReadOnlyDto
    /// <summary>
    /// Gets or inits the associated receiver details.
    /// </summary>
-    public ReceiverDto? Receiver { get; set; }
+    public ReceiverReadDto? Receiver { get; set; }
 }
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyUpdateDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeReceiverReadOnly/EnvelopeReceiverReadOnlyUpdateDto.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
+namespace EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;

 /// <summary>
 /// Data Transfer Object for updating a read-only envelope receiver.
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeTypeDto.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// Data Transfer Object representing a type of envelope with its configuration settings.
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -1,13 +1,13 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Common.Dto.History;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver;
-using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
-using EnvelopeGenerator.Application.Common.Dto.Messaging;
-using EnvelopeGenerator.Application.Common.Dto.Receiver;
-using EnvelopeGenerator.Application.Common.Extensions;
+using EnvelopeGenerator.Application.DTOs.EnvelopeHistory;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiver;
+using EnvelopeGenerator.Application.DTOs.EnvelopeReceiverReadOnly;
+using EnvelopeGenerator.Application.DTOs.Messaging;
+using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Extensions;
 using EnvelopeGenerator.Domain.Entities;

-namespace EnvelopeGenerator.Application.Common.Dto;
+namespace EnvelopeGenerator.Application.DTOs;

 /// <summary>
 /// Represents the AutoMapper profile configuration for mapping between
@@ -23,38 +23,40 @@ public class MappingProfile : Profile
    {
        // Entity to DTO mappings
        CreateMap<Config, ConfigDto>();
-        CreateMap<Signature, SignatureDto>();
+        CreateMap<DocumentReceiverElement, DocumentReceiverElementDto>();
        CreateMap<DocumentStatus, DocumentStatusDto>();
        CreateMap<EmailTemplate, EmailTemplateDto>();
        CreateMap<Envelope, EnvelopeDto>();
-        CreateMap<Document, DocumentDto>();
-        CreateMap<Domain.Entities.History, HistoryDto>();
-        CreateMap<Domain.Entities.History, HistoryCreateDto>();
+        CreateMap<EnvelopeCertificate, EnvelopeCertificateDto>();
+        CreateMap<EnvelopeDocument, EnvelopeDocumentDto>();
+        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryDto>();
+        CreateMap<Domain.Entities.EnvelopeHistory, EnvelopeHistoryCreateDto>();
        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverDto>();
        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
        CreateMap<EnvelopeType, EnvelopeTypeDto>();
-        CreateMap<Domain.Entities.Receiver, ReceiverDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverReadDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverCreateDto>();
+        CreateMap<Domain.Entities.Receiver, ReceiverUpdateDto>();
        CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
-        CreateMap<ElementAnnotation, AnnotationDto>();
-        CreateMap<ThirdPartyModule, ThirdPartyModuleDto>();
-        CreateMap<EnvelopeReport, EnvelopeReportDto>();

        // DTO to Entity mappings
        CreateMap<ConfigDto, Config>();
-        CreateMap<SignatureDto, Signature>();
+        CreateMap<DocumentReceiverElementDto, DocumentReceiverElement>();
        CreateMap<DocumentStatusDto, DocumentStatus>();
        CreateMap<EmailTemplateDto, EmailTemplate>();
        CreateMap<EnvelopeDto, Envelope>();
-        CreateMap<DocumentDto, Document>();
-        CreateMap<HistoryDto, Domain.Entities.History>();
-        CreateMap<HistoryCreateDto, Domain.Entities.History>();
+        CreateMap<EnvelopeCertificateDto, EnvelopeCertificate>();
+        CreateMap<EnvelopeDocumentDto, EnvelopeDocument>();
+        CreateMap<EnvelopeHistoryDto, Domain.Entities.EnvelopeHistory>();
+        CreateMap<EnvelopeHistoryCreateDto, Domain.Entities.EnvelopeHistory>();
        CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
        CreateMap<EnvelopeTypeDto, EnvelopeType>();
-        CreateMap<ReceiverDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+        CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
+        CreateMap<ReceiverCreateDto, Domain.Entities.Receiver>();
+        CreateMap<ReceiverUpdateDto, Domain.Entities.Receiver>();
+        CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
        CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
        CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
-        CreateMap<AnnotationCreateDto, ElementAnnotation>()
-            .ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));

        // Messaging mappings
        // for GTX messaging
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Developer01	1e2e018f7f	MS Anpassungen	2025-11-12 21:43:50 +01:00
Developer01	69afea012b	Handling InsertReceivers und kleinigkeiten frm Main	2025-09-16 09:00:43 +02:00
Developer01	85e0bc3400	Logging wegen Y-Konstante	2025-09-04 14:35:54 +02:00