Folder structure & files updated

Deleted demo files
Added folder structure and files
2026-03-17 16:17:52 +01:00 · 2026-03-17 13:03:34 +01:00 · 2026-03-17 12:36:14 +01:00 · 2026-03-16 16:16:44 +01:00
120 changed files with 2244 additions and 1151 deletions
--- a/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/EnvelopeDto.cs
@@ -2,7 +2,6 @@
 using DigitalData.UserManager.Application.DTOs.User;
 using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
-using EnvelopeGenerator.Domain.Interfaces;
 using Microsoft.AspNetCore.Mvc;

 namespace EnvelopeGenerator.Application.Common.Dto;
@@ -11,7 +10,7 @@ namespace EnvelopeGenerator.Application.Common.Dto;
 /// 
 /// </summary>
 [ApiExplorerSettings(IgnoreApi = true)]
-public record EnvelopeDto : IEnvelope
+public record EnvelopeDto
 {
 	/// <summary>
 	/// 
@@ -75,12 +74,10 @@ public record EnvelopeDto : IEnvelope
    /// </summary>
    public int? EnvelopeTypeId { get; set; }

-    // TODO: use ReadAndConfirm property name
    /// <summary>
    /// 
    /// </summary>
-    [Obsolete("Use EnvelopeExtensions.IsReadAndConfirm extension metot instead.")]
-    public bool ReadOnly => this.IsReadAndConfirm();
+    public bool ReadOnly => EnvelopeTypeId == 2;

    /// <summary>
    /// 
--- a/EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/AutoMapperAuditingExtensions.cs
@@ -13,12 +13,12 @@ public static class AutoMapperAuditingExtensions
    /// </summary>
    public static IMappingExpression<TSource, TDestination> MapAddedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
        where TDestination : IHasAddedWhen
-        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.Now));
+        => expression.ForMember(dest => dest.AddedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));

    /// <summary>
    /// Maps <see cref="IHasChangedWhen.ChangedWhen"/> to the current UTC time.
    /// </summary>
    public static IMappingExpression<TSource, TDestination> MapChangedWhen<TSource, TDestination>(this IMappingExpression<TSource, TDestination> expression)
        where TDestination : IHasChangedWhen
-        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.Now));
+        => expression.ForMember(dest => dest.ChangedWhen, opt => opt.MapFrom(_ => DateTime.UtcNow));
 }
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
@@ -29,12 +29,15 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
    /// <param name="notification"></param>
    /// <param name="cancel"></param>
    /// <returns></returns>
-    public Task Handle(DocSignedNotification notification, CancellationToken cancel) => _sender.Send(new CreateDocStatusCommand()
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
    {
-        EnvelopeId = notification.EnvelopeId,
-        ReceiverId = notification.ReceiverId,
-        Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot
-                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations)
+        await _sender.Send(new SaveDocStatusCommand()
+        {
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = notification.PsPdfKitAnnotation is PsPdfKitAnnotation annot 
+                    ? JsonSerializer.Serialize(annot.Instant, Format.Json.ForAnnotations) 
                    : BlankAnnotationJson
-    }, cancel);
+        }, cancel);
+    }
 }
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
@@ -3,7 +3,6 @@ using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.Options;
-using EnvelopeGenerator.Domain.Interfaces;

 namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;

@@ -46,25 +45,6 @@ public class SendSignedMailHandler : SendMailHandler<DocSignedNotification>
            { "[DOCUMENT_TITLE]", notification.Envelope?.Title ?? string.Empty },
        };

-        if (notification.Envelope.IsReadAndConfirm())
-        {
-            placeHolders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
-            placeHolders["[DOCUMENT_PROCESS]"] = string.Empty;
-            placeHolders["[FINAL_STATUS]"] = "Lesebestätigung";
-            placeHolders["[FINAL_ACTION]"] = "Empfänger bestätigt";
-            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
-            placeHolders["[RECEIVER_ACTION]"] = "bestätigt";
-        }
-        else
-        {
-            placeHolders["[SIGNATURE_TYPE]"] = "Signieren";
-            placeHolders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
-            placeHolders["[FINAL_STATUS]"] = "Signatur";
-            placeHolders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
-            placeHolders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
-            placeHolders["[RECEIVER_ACTION]"] = "unterschrieben";
-        }
-
        return placeHolders;
    }
 }
--- a/EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/SendMailHandler.cs
@@ -113,7 +113,7 @@ public abstract class SendMailHandler<TNotification> : INotificationHandler<TNot
            EmailAddress = notification.EmailAddress,
            EmailBody = temp.Body,
            EmailSubj = temp.Subject,
-            AddedWhen = DateTime.Now,
+            AddedWhen = DateTime.UtcNow,
            AddedWho = DispatcherParams.AddedWho,
            SendingProfile = DispatcherParams.SendingProfile,
            ReminderTypeId = DispatcherParams.ReminderTypeId,
--- a/EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/CreateDocStatusCommand.cs
@@ -8,22 +8,12 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// <summary>
 /// 
 /// </summary>
-public record CreateDocStatusCommand : IRequest<DocumentStatus>
+public record CreateDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatus>
 {
    /// <summary>
-    /// 
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
    /// </summary>
-    public int EnvelopeId { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ReceiverId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the display value associated with the status.
-    /// </summary>
-    public string? Value { get; set; }
+    public DateTime AddedWhen => StatusChangedWhen;
 }

 /// <summary>
--- a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
@@ -0,0 +1,54 @@
+using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Constants;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
+
+/// <summary>
+/// 
+/// </summary>
+public record ModifyDocStatusCommandBase : EnvelopeReceiverQueryBase
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? EnvelopeId => Envelope.Id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? ReceiverId => Receiver.Id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public override ReceiverQueryBase Receiver { get => base.Receiver; set => base.Receiver = value; }
+
+    /// <summary>
+    /// Gets the current status code.
+    /// </summary>
+    public DocumentStatus Status => Value is null ? DocumentStatus.Created : DocumentStatus.Signed;
+
+    /// <summary>
+    /// Gets or sets the display value associated with the status.
+    /// </summary>
+    public string? Value { get; set; }
+
+    /// <summary>
+    /// Gets timestamp when this record was added.
+    /// </summary>
+    public DateTime StatusChangedWhen { get; } = DateTime.Now;
+
+    /// <summary>
+    /// Maps the current command to a new instance of the specified type.
+    /// </summary>
+    /// <typeparam name="TDest"></typeparam>
+    /// <returns></returns>
+    public TDest To<TDest>() where TDest : ModifyDocStatusCommandBase, new()
+        => new()
+        {
+            Key = Key,
+            Envelope = Envelope,
+            Receiver = Receiver,
+            Value = Value
+        };
+}
--- a/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
@@ -0,0 +1,77 @@
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using AutoMapper;
+using EnvelopeGenerator.Application.Common.Dto;
+using EnvelopeGenerator.Application.Common.Extensions;
+
+namespace EnvelopeGenerator.Application.DocStatus.Commands;
+
+/// <summary>
+/// Represents a command to save the status of a document, either by creating a new status or updating an existing one based on the provided envelope and receiver identifiers.
+/// It returns the identifier of the saved document status.
+/// </summary>
+public record SaveDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatusDto?>;
+
+/// <summary>
+/// 
+/// </summary>
+public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand, DocumentStatusDto?>
+{
+    private readonly IMapper _mapper;
+
+    private readonly IRepository<DocumentStatus> _repo;
+
+    private readonly IRepository<Envelope> _envRepo;
+
+    private readonly IRepository<Receiver> _rcvRepo;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="mapper"></param>
+    /// <param name="repo"></param>
+    /// <param name="rcvRepo"></param>
+    /// <param name="envRepo"></param>
+    public SaveDocStatusCommandHandler(IMapper mapper, IRepository<DocumentStatus> repo, IRepository<Receiver> rcvRepo, IRepository<Envelope> envRepo)
+    {
+        _mapper = mapper;
+        _repo = repo;
+        _rcvRepo = rcvRepo;
+        _envRepo = envRepo;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="request"></param>
+    /// <param name="cancel"></param>
+    /// <returns></returns>
+    public async Task<DocumentStatusDto?> Handle(SaveDocStatusCommand request, CancellationToken cancel)
+    {
+        // ceck if exists
+        bool isExists = await _repo.ReadOnly().Where(request).AnyAsync(cancel);
+
+        var env = await _envRepo.ReadOnly().Where(request.Envelope).FirstAsync(cancel);
+        var rcv = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+        request.Envelope.Id = env.Id;
+        request.Receiver.Id = rcv.Id;
+
+        if (isExists)
+        {
+            var uReq = request.To<UpdateDocStatusCommand>();
+            await _repo.UpdateAsync(uReq, q => q.Where(request), cancel);
+        }
+        else
+        {
+            var cReq = request.To<CreateDocStatusCommand>();
+            await _repo.CreateAsync(cReq, cancel);
+        }
+
+        var docStatus = await _repo.ReadOnly().Where(request).SingleOrDefaultAsync(cancel);
+        
+        return _mapper.Map<DocumentStatusDto>(docStatus);
+    }
+}
--- a/EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/UpdateDocStatusCommand.cs
@@ -1,41 +1,14 @@
-using EnvelopeGenerator.Application.Common.Commands;
-using EnvelopeGenerator.Domain.Entities;
-using System.Linq.Expressions;
+using EnvelopeGenerator.Domain;

 namespace EnvelopeGenerator.Application.DocStatus.Commands;

 /// <summary>
 /// 
 /// </summary>
-/// <param name="Value"></param>
-public record DocStatusUpdateDto(string? Value);
-
-/// <summary>
-/// 
-/// </summary>
-public record UpdateDocStatusCommand : UpdateCommand<DocStatusUpdateDto, DocumentStatus>
+public record UpdateDocStatusCommand : ModifyDocStatusCommandBase
 {
    /// <summary>
-    /// 
+    /// Gets timestamp when this record was added. Returns the StatusChangedWhen value.
    /// </summary>
-    public int EnvelopeId { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public int ReceiverId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the display value associated with the status.
-    /// </summary>
-    public string? Value { get; set; }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns></returns>
-    public override Expression<Func<DocumentStatus, bool>> BuildQueryExpression()
-    {
-        return ds => ds.EnvelopeId == EnvelopeId && ds.ReceiverId == ReceiverId;
-    }
+    public DateTime? ChangedWhen => StatusChangedWhen;
 }
--- a/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
@@ -18,16 +18,11 @@ public class MappingProfile : Profile
        CreateMap<CreateDocStatusCommand, DocumentStatus>()
        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .ForMember(dest => dest.Status, opt => opt.MapFrom(
-            src => src.Value == null 
-                ? Domain.Constants.DocumentStatus.Created 
-                : Domain.Constants.DocumentStatus.Signed))
        .MapAddedWhen();

        CreateMap<UpdateDocStatusCommand, DocumentStatus>()
        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
        .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-        .ForMember(dest => dest.StatusChangedWhen, opt => opt.MapFrom(src => DateTime.Now))
        .MapChangedWhen();
    }
 }
--- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
+++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj
@@ -37,7 +37,7 @@
 	</ItemGroup>

 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
 	</ItemGroup>

 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
@@ -80,7 +80,7 @@

 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-	  <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
 	  <PackageReference Include="CommandDotNet">
 		<Version>7.0.5</Version>
 	  </PackageReference>
@@ -88,6 +88,7 @@

 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>
@@ -95,6 +96,7 @@

 	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
 	  <PackageReference Include="AutoMapper" Version="14.0.0" />
+	  <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
 	  <PackageReference Include="CommandDotNet">
 	    <Version>8.1.1</Version>
 	  </PackageReference>
--- a/EnvelopeGenerator.Application/Histories/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Histories/MappingProfile.cs
@@ -1,5 +1,4 @@
 using AutoMapper;
-using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Histories.Commands;
 using EnvelopeGenerator.Domain.Entities;

@@ -18,7 +17,6 @@ public class MappingProfile: Profile
        CreateMap<CreateHistoryCommand, History>()
            .ForMember(dest => dest.Envelope, opt => opt.Ignore())
            .ForMember(dest => dest.Sender, opt => opt.Ignore())
-            .ForMember(dest => dest.Receiver, opt => opt.Ignore())
-            .MapAddedWhen();
+            .ForMember(dest => dest.Receiver, opt => opt.Ignore());
    }
 }
--- a/EnvelopeGenerator.Application/Resources/Resource.cs
+++ b/EnvelopeGenerator.Application/Resources/Resource.cs
@@ -190,13 +190,6 @@ public static class Extensions
    /// <returns></returns>
    public static string SignDoc(this IStringLocalizer localizer) => localizer[nameof(SignDoc)].Value;

-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ConfirmDoc(this IStringLocalizer localizer) => localizer[nameof(ConfirmDoc)].Value;
-
    /// <summary>
    /// 
    /// </summary>
@@ -211,13 +204,6 @@ public static class Extensions
    /// <returns></returns>
    public static string DocSigned(this IStringLocalizer localizer) => localizer[nameof(DocSigned)].Value;

-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string DocConfirmed(this IStringLocalizer localizer) => localizer[nameof(DocConfirmed)].Value;
-
    /// <summary>
    /// 
    /// </summary>
@@ -253,13 +239,6 @@ public static class Extensions
    /// <returns></returns>
    public static string SigAgree(this IStringLocalizer localizer) => localizer[nameof(SigAgree)].Value;

-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ConfirmAgree(this IStringLocalizer localizer) => localizer[nameof(ConfirmAgree)].Value;
-
    /// <summary>
    /// 
    /// </summary>
@@ -288,13 +267,6 @@ public static class Extensions
    /// <returns></returns>
    public static string RejectionInfo1(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1)].Value;

-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string RejectionInfo1ForConfirmation(this IStringLocalizer localizer) => localizer[nameof(RejectionInfo1ForConfirmation)].Value;
-
    /// <summary>
    /// 
    /// </summary>
@@ -323,13 +295,6 @@ public static class Extensions
    /// <returns></returns>
    public static string SigningProcessTitle(this IStringLocalizer localizer) => localizer[nameof(SigningProcessTitle)].Value;

-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="localizer"></param>
-    /// <returns></returns>
-    public static string ConfirmationProcessTitle(this IStringLocalizer localizer) => localizer[nameof(ConfirmationProcessTitle)].Value;
-
    /// <summary>
    /// 
    /// </summary>
--- a/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.de-DE.resx
@@ -250,7 +250,7 @@
    <value>Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
  </data>
  <data name="RejectionInfo2_ext" xml:space="preserve">
-    <value>Der Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
+    <value>Das Vorgang wurde von einer der beteiligten Parteien abgelehnt. Sie können bei Bedarf mit {0}, &lt;a href="mailto:{1}?subject={2}&amp;body=Sehr geehrte(r)%20{0},%0A%0A%0A"&gt;{1}&lt;/a&gt; Kontakt aufnehmen.</value>
  </data>
  <data name="RejectionReasonQ" xml:space="preserve">
    <value>Bitte geben Sie einen Grund an:</value>
@@ -447,34 +447,4 @@
  <data name="DocumentReset" xml:space="preserve">
    <value>Dokument wurde zurückgesetzt.</value>
  </data>
-  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Dokument erfolgreich gelesen und bestätigt!</value>
-  </data>
-  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
-    <value>Sie haben das Dokument gelesen und bestätigt. Im Anschluss erhalten Sie eine schriftliche Bestätigung.</value>
-  </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Bestätigen</value>
-  </data>
-  <data name="RejectionInfo1Confirmation" xml:space="preserve">
-    <value>Dieser Bestätigungsvorgang wurde abgelehnt!</value>
-  </data>
-  <data name="ConfirmDoc" xml:space="preserve">
-    <value>Dokument bestätigen</value>
-  </data>
-  <data name="DocConfirmed" xml:space="preserve">
-    <value>Dokument bestätigt</value>
-  </data>
-  <data name="ConfirmAgree" xml:space="preserve">
-    <value>Durch Klick auf Abschließen bestätige ich, das Dokument gelesen und zur Kenntnis genommen zu haben.</value>
-  </data>
-  <data name="ConfirmedBy" xml:space="preserve">
-    <value>Bestätigt von</value>
-  </data>
-  <data name="ConfirmationProcessTitle" xml:space="preserve">
-    <value>Titel des Lesebetätigungs-Vorgangs</value>
-  </data>
-  <data name="Confirmations" xml:space="preserve">
-    <value>Bestätigungen</value>
-  </data>
 </root>
--- a/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.en-US.resx
@@ -447,34 +447,4 @@
  <data name="DocumentReset" xml:space="preserve">
    <value>Document has been reset.</value>
  </data>
-  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Document successfully read and confirmed!</value>
-  </data>
-  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
-    <value>You have read and confirmed the document. You will receive a written confirmation afterwards.</value>
-  </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Confirm</value>
-  </data>
-  <data name="RejectionInfo1Confirmation" xml:space="preserve">
-    <value>This confirmation process has been rejected!</value>
-  </data>
-  <data name="ConfirmDoc" xml:space="preserve">
-    <value>Confirm Document</value>
-  </data>
-  <data name="DocConfirmed" xml:space="preserve">
-    <value>Document confirmed</value>
-  </data>
-  <data name="ConfirmAgree" xml:space="preserve">
-    <value>By clicking on “Complete”, I confirm that I have read and taken note of the document.</value>
-  </data>
-  <data name="ConfirmedBy" xml:space="preserve">
-    <value>Confirmed by</value>
-  </data>
-  <data name="ConfirmationProcessTitle" xml:space="preserve">
-    <value>Title of the read confirmation process</value>
-  </data>
-  <data name="Confirmations" xml:space="preserve">
-    <value>Confirmations</value>
-  </data>
 </root>
--- a/EnvelopeGenerator.Application/Resources/Resource.fr-FR.resx
+++ b/EnvelopeGenerator.Application/Resources/Resource.fr-FR.resx
@@ -447,34 +447,4 @@
  <data name="DocumentReset" xml:space="preserve">
    <value>Le document a été réinitialisé.</value>
  </data>
-  <data name="DocumentSuccessfullyConfirmed" xml:space="preserve">
-    <value>Document lu et confirmé avec succès !</value>
-  </data>
-  <data name="DocumentConfirmedConfirmationMessage" xml:space="preserve">
-    <value>Vous avez lu et confirmé le document. Vous recevrez une confirmation écrite par la suite.</value>
-  </data>
-  <data name="Confirm" xml:space="preserve">
-    <value>Confirmer</value>
-  </data>
-  <data name="RejectionInfo1Confirmation" xml:space="preserve">
-    <value>Cette procédure de confirmation a été rejetée !</value>
-  </data>
-  <data name="ConfirmDoc" xml:space="preserve">
-    <value>Confirmer le document</value>
-  </data>
-  <data name="DocConfirmed" xml:space="preserve">
-    <value>Document confirmé</value>
-  </data>
-  <data name="ConfirmAgree" xml:space="preserve">
-    <value>En cliquant sur « Terminer », je confirme avoir lu et pris connaissance du document.</value>
-  </data>
-  <data name="ConfirmedBy" xml:space="preserve">
-    <value>Confirmé par</value>
-  </data>
-  <data name="ConfirmationProcessTitle" xml:space="preserve">
-    <value>Titre de la procédure de confirmation de lecture</value>
-  </data>
-  <data name="Confirmations" xml:space="preserve">
-    <value>Confirmations</value>
-  </data>
 </root>
--- a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs
@@ -12,7 +12,6 @@ using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiverReadOnly;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using MediatR;
-using EnvelopeGenerator.Domain.Interfaces;

 namespace EnvelopeGenerator.Application.Services;

@@ -50,33 +49,14 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		_sender = sender;
    }

-	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? er = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(string? accessCode = null, EnvelopeReceiverDto? envelopeReceiverDto = null)
 	{
-		if (er!.Envelope.IsReadAndConfirm())
-		{
-			_placeholders["[SIGNATURE_TYPE]"] = "Lesen und bestätigen";
-			_placeholders["[DOCUMENT_PROCESS]"] = string.Empty;
-            _placeholders["[FINAL_STATUS]"] = "Lesebestätigung";
-            _placeholders["[FINAL_ACTION]"] = "Empfänger bestätigt";
-            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Empfänger abgelehnt!";
-            _placeholders["[RECEIVER_ACTION]"] = "bestätigt";
-        }
-		else
-        {
-            _placeholders["[SIGNATURE_TYPE]"] = "Signieren";
-            _placeholders["[DOCUMENT_PROCESS]"] = " und elektronisch unterschreiben";
-            _placeholders["[FINAL_STATUS]"] = "Signatur";
-            _placeholders["[FINAL_ACTION]"] = "Vertragspartner unterzeichnet";
-            _placeholders["[REJECTED_BY_OTHERS]"] = "anderen Vertragspartner abgelehnt! Ihre notwendige Unterzeichnung wurde verworfen.";
-            _placeholders["[RECEIVER_ACTION]"] = "unterschrieben";
-        }
-
 		if (accessCode is not null)
 			_placeholders["[DOCUMENT_ACCESS_CODE]"] = accessCode;

-		if (er?.Envelope is not null && er.Receiver is not null)
+		if (envelopeReceiverDto?.Envelope is not null && envelopeReceiverDto.Receiver is not null)
 		{
-			var erId = (er.Envelope.Uuid, er.Receiver.Signature).ToEnvelopeKey();
+			var erId = (envelopeReceiverDto.Envelope.Uuid, envelopeReceiverDto.Receiver.Signature).ToEnvelopeKey();
 			var sigHost = await _configService.ReadDefaultSignatureHost();
 			var linkToDoc = $"{sigHost}/EnvelopeKey/{erId}";
 			_placeholders["[LINK_TO_DOCUMENT]"] = linkToDoc;
@@ -86,8 +66,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 		return _placeholders;
 	}

-    // TODO: merge the two CreatePlaceholders methods by using a common parameter object containing all the required information to create the place holders.
-    private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
+	private async Task<Dictionary<string, string>> CreatePlaceholders(EnvelopeReceiverReadOnlyDto? readOnlyDto = null)
 	{
 		if (readOnlyDto?.Envelope is not null && readOnlyDto.Receiver is not null)
 		{
@@ -145,7 +124,7 @@ public class EnvelopeMailService : EmailOutService, IEnvelopeMailService
 			return acResult.ToFail<int>().Notice(LogLevel.Error, "Therefore, access code cannot be sent");
 		var accessCode = acResult.Data;

-		var placeholders = await CreatePlaceholders(accessCode: accessCode, er: dto);
+		var placeholders = await CreatePlaceholders(accessCode: accessCode, envelopeReceiverDto: dto);

 		// Add optional place holders.
 		if (optionalPlaceholders is not null)
--- a/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj
+++ b/EnvelopeGenerator.BBTests/EnvelopeGenerator.BBTests.vbproj
@@ -487,6 +487,10 @@
      <Project>{6EA0C51F-C2B1-4462-8198-3DE0B32B74F8}</Project>
      <Name>EnvelopeGenerator.CommonServices</Name>
    </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.CommonServices\EnvelopeGenerator.CommonServices.vbproj">
+      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
+      <Name>EnvelopeGenerator.CommonServices</Name>
+    </ProjectReference>
    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
      <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
      <Name>EnvelopeGenerator.Domain</Name>
--- a/EnvelopeGenerator.BBTests/frmFinalizePDF.Designer.vb
+++ b/EnvelopeGenerator.BBTests/frmFinalizePDF.Designer.vb
@@ -27,7 +27,6 @@ Partial Class frmFinalizePDF
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.Button2 = New System.Windows.Forms.Button()
-        Me.Button3 = New System.Windows.Forms.Button()
        Me.txtResult = New System.Windows.Forms.TextBox()
        Me.txtEnvelope = New System.Windows.Forms.TextBox()
        Me.SuspendLayout()
@@ -76,15 +75,6 @@ Partial Class frmFinalizePDF
        Me.Button2.Text = "Merge Json"
        Me.Button2.UseVisualStyleBackColor = True
        '
-        'Button3
-        '
-        Me.Button3.Location = New System.Drawing.Point(15, 160)
-        Me.Button3.Name = "Button3"
-        Me.Button3.Size = New System.Drawing.Size(166, 23)
-        Me.Button3.TabIndex = 5
-        Me.Button3.Text = "Full Finalize Test"
-        Me.Button3.UseVisualStyleBackColor = True
-        '
        'txtResult
        '
        Me.txtResult.Location = New System.Drawing.Point(333, 12)
@@ -107,7 +97,6 @@ Partial Class frmFinalizePDF
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(800, 450)
        Me.Controls.Add(Me.txtResult)
-        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.Label2)
@@ -127,6 +116,5 @@ Partial Class frmFinalizePDF
    Friend WithEvents Label2 As Label
    Friend WithEvents Button1 As Button
    Friend WithEvents Button2 As Button
-    Friend WithEvents Button3 As Button
    Friend WithEvents txtResult As TextBox
 End Class
--- a/EnvelopeGenerator.BBTests/frmFinalizePDF.vb
+++ b/EnvelopeGenerator.BBTests/frmFinalizePDF.vb
@@ -7,12 +7,11 @@ Imports GdPicture14
 Imports Newtonsoft.Json.Linq
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
+Imports System.Text
 Imports DigitalData.Core.Abstractions
-Imports DigitalData.Core.Abstraction.Application.Repository
-Imports EnvelopeGenerator.Domain.Entities

 Public Class frmFinalizePDF
-    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;" + "Encrypt=True;TrustServerCertificate=True;"
+    Private Const CONNECTIONSTRING = "Server=sDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=+bk8oAbbQP1AzoHtvZUbd+Mbok2f8Fl4miEx1qssJ5yEaEWoQJ9prg4L14fURpPnqi1WMNs9fE4=;"

    Private Database As MSSQLServer
    Private LogConfig As LogConfig
@@ -94,118 +93,56 @@ Public Class frmFinalizePDF
    End Function

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim oTable = LoadAnnotationDataForEnvelope()
-        Dim oJsonList = oTable.Rows.
-            Cast(Of DataRow).
-            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-            ToList()
-
-        Dim envelopeId As Integer = CInt(txtEnvelope.Text)
-        Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-        Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-        Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-        Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
-
-        File.WriteAllBytes(oNewPath, oNewBuffer)
-
-        Process.Start(oNewPath)
-    End Sub
-
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Dim oTable = LoadAnnotationDataForEnvelope()
-        Dim oJsonList = oTable.Rows.
-            Cast(Of DataRow).
-            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-            Select(Function(s As String) JObject.Parse(s)).
-            ToList()
-
-        Dim oJObject1 = oJsonList.First()
-        Dim oJObject2 = oJsonList.ElementAt(1)
-
-        oJObject1.Merge(oJObject2)
-
-        txtResult.Text = oJObject1.ToString()
-    End Sub
-
-    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
        Try
-            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
-            Dim log As New System.Text.StringBuilder()

-            ' 1. Load annotation JSON data (same as Service)
            Dim oTable = LoadAnnotationDataForEnvelope()
            Dim oJsonList = oTable.Rows.
                Cast(Of DataRow).
                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
                ToList()
-            log.AppendLine($"Annotation JSON count: {oJsonList.Count}")

-            ' 2. Load document bytes (same as Service)
+            Dim envelopeId As Integer = CInt(txtEnvelope.Text)
            Dim oBuffer As Byte() = ReadEnvelope(envelopeId)
-            log.AppendLine($"Document bytes: {oBuffer.Length}")
-
-            ' 3. Check what BurnAnnotsToPDF will do internally
-            Using scope = Factory.Shared.ScopeFactory.CreateScope()
-                Dim envRepo = scope.ServiceProvider.Repository(Of Envelope)()
-                Dim envelope = envRepo.Where(Function(env) env.Id = envelopeId).FirstOrDefault()
-
-                If envelope Is Nothing Then
-                    log.AppendLine("ERROR: Envelope not found in EF Core!")
-                    txtResult.Text = log.ToString()
-                    Return
-                End If
-
-                log.AppendLine($"Envelope found: Id={envelope.Id}, EnvelopeTypeId={envelope.EnvelopeTypeId}")
-                log.AppendLine($"ReadOnly (IsReadAndConfirm): {envelope.ReadOnly}")
-
-                If envelope.ReadOnly Then
-                    log.AppendLine(">>> EARLY RETURN: ReadOnly=True, original PDF returned without burning")
-                    txtResult.Text = log.ToString()
-                    Return
-                End If
-
-                Dim sigRepo = scope.ServiceProvider.Repository(Of Signature)()
-                Dim elements = sigRepo _
-                    .Where(Function(sig) sig.Document.EnvelopeId = envelopeId) _
-                    .Include(Function(sig) sig.Annotations) _
-                    .ToList()
-
-                log.AppendLine($"Elements (Signature) count: {elements.Count}")
-
-                If elements.Any() Then
-                    log.AppendLine(">>> PATH: BurnElementAnnotsToPDF (new element-based path)")
-                    For Each elem In elements
-                        Dim annotCount = If(elem.Annotations IsNot Nothing, elem.Annotations.Count(), 0)
-                        log.AppendLine($"  Element Id={elem.Id}, Page={elem.Page}, X={elem.X}, Y={elem.Y}, W={elem.Width}, H={elem.Height}, Annotations={annotCount}")
-                        If elem.Annotations IsNot Nothing Then
-                            For Each annot In elem.Annotations
-                                log.AppendLine($"    Annot: Name={annot.Name}, Type={annot.Type}, X={annot.X}, Y={annot.Y}, W={annot.Width}, H={annot.Height}")
-                            Next
-                        End If
-                    Next
-                Else
-                    log.AppendLine(">>> PATH: BurnInstantJSONAnnotsToPDF (old JSON-based path)")
-                End If
-            End Using
-
-            ' 4. Actually call BurnAnnotsToPDF (same as Service)
-            log.AppendLine("")
-            log.AppendLine("Calling BurnAnnotsToPDF...")
            Dim oNewBuffer = PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, envelopeId)
-            log.AppendLine($"Result bytes: {oNewBuffer.Length}")
-            log.AppendLine($"Same as input: {oBuffer.Length = oNewBuffer.Length AndAlso oBuffer.SequenceEqual(oNewBuffer)}")
-
-            ' 5. Write output
            Dim desktopPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Desktop)
-            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}_FullTest.burned.pdf")
-            File.WriteAllBytes(oNewPath, oNewBuffer)
-            log.AppendLine($"Output: {oNewPath}")
+            Dim oNewPath = Path.Combine(desktopPath, $"E{txtEnvelope.Text}R{txtReceiver.Text}.burned.pdf")
+
+            File.WriteAllBytes(oNewPath, oNewBuffer)

-            txtResult.Text = log.ToString()
            Process.Start(oNewPath)
+        Catch ex As Exception
+            Dim exMsg As StringBuilder = New StringBuilder(ex.Message).AppendLine()
+
+            Dim innerEx = ex.InnerException
+            While (innerEx IsNot Nothing)
+                exMsg.AppendLine(innerEx.Message)
+                innerEx = innerEx.InnerException
+            End While
+
+            MsgBox(exMsg.ToString(), MsgBoxStyle.Critical)
+        End Try
+
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        Try
+            Dim oTable = LoadAnnotationDataForEnvelope()
+            Dim oJsonList = oTable.Rows.
+                Cast(Of DataRow).
+                Select(Function(r As DataRow) r.Item("VALUE").ToString()).
+                Select(Function(s As String) JObject.Parse(s)).
+                ToList()
+
+            Dim oJObject1 = oJsonList.First()
+            Dim oJObject2 = oJsonList.ElementAt(1)
+
+            oJObject1.Merge(oJObject2)
+
+            txtResult.Text = oJObject1.ToString()
+

        Catch ex As Exception
-            txtResult.Text = $"ERROR: {ex.Message}{vbCrLf}{vbCrLf}{ex.ToString()}"
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
 End Class
--- a/EnvelopeGenerator.BBTests/packages.config
+++ b/EnvelopeGenerator.BBTests/packages.config
@@ -15,13 +15,13 @@
  <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
-  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework" version="6.5.1" targetFramework="net462" />
  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
@@ -62,10 +62,10 @@
  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
  <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net462" />
  <package id="System.ClientModel" version="1.8.0" targetFramework="net462" />
-  <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
-  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net462" />
  <package id="System.Data.Common" version="4.3.0" targetFramework="net462" />
  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
@@ -74,23 +74,23 @@
  <package id="System.Formats.Asn1" version="10.0.3" targetFramework="net462" />
  <package id="System.IdentityModel.Tokens.Jwt" version="7.7.1" targetFramework="net462" />
  <package id="System.IO.FileSystem.AccessControl" version="5.0.0" targetFramework="net462" />
-  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
  <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
-  <package id="System.Management" version="8.0.0" targetFramework="net462" />
-  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Management" version="9.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net462" />
  <package id="System.Memory.Data" version="8.0.1" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
  <package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
  <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
  <package id="System.Security.Cryptography.Cng" version="5.0.0" targetFramework="net462" />
-  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
  <package id="System.Security.Cryptography.ProtectedData" version="4.5.0" targetFramework="net462" />
  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
-  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net462" />
-  <package id="System.Text.Json" version="8.0.6" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net462" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
 </packages>
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/FinalizeDocumentJob.vb
@@ -15,7 +15,6 @@ Imports DigitalData.Core.Abstraction.Application
 Imports EnvelopeGenerator.Infrastructure
 Imports Microsoft.EntityFrameworkCore
 Imports DigitalData.Core.Abstractions
-Imports EnvelopeGenerator.Domain.Interfaces

 Namespace Jobs
    Public Class FinalizeDocumentJob
@@ -231,29 +230,6 @@ Namespace Jobs

            Return Task.FromResult(True)
        End Function
-
-#Region "From BBTests"
-        Private Function ReadEnvelope(pEnvID As Integer) As Byte()
-            Dim strSql As String = "Select [BYTE_DATA] from [TBSIG_ENVELOPE_DOCUMENT] WHERE ENVELOPE_ID = " & pEnvID
-            Dim obyteDB = Database.GetScalarValue(strSql)
-            If Not IsDBNull(obyteDB) Then
-                Dim fileData As Byte() = DirectCast(Database.GetScalarValue(strSql), Byte())
-                If fileData IsNot Nothing Then
-                    Return fileData
-                End If
-            End If
-
-            Throw New InvalidOperationException($"Byte data is null. Envelope ID: {pEnvID}")
-
-        End Function
-
-        Private Function LoadAnnotationDataForEnvelope(pEnvID As Integer) As DataTable
-            Dim oSql = $"SELECT VALUE FROM [TBSIG_DOCUMENT_STATUS] WHERE ENVELOPE_ID = {pEnvID}"
-            Return Database.GetDatatable(oSql)
-
-        End Function
-#End Region
-
        Private Sub Update_File_DB(pFilePath As String, pEnvelopeID As Long)
            Dim SqlCom As SqlCommand
            Dim imageData As Byte()
@@ -351,7 +327,7 @@ Namespace Jobs
                Logger.Warn($"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}] ")
            End If

-            If oMailToReceivers <> FinalEmailType.No And pEnvelope.IsReadAndSign() Then
+            If oMailToReceivers <> FinalEmailType.No Then
                Logger.Debug("Sending emails to receivers..")
                SendFinalEmailToReceivers(pEnvelope) ', pAttachment
            Else
@@ -442,18 +418,7 @@ Namespace Jobs
                End Try
            End If

-#Region "From BBTests"
-            Dim oTable = LoadAnnotationDataForEnvelope(pEnvelopeId)
-            Dim oJsonList = oTable.Rows.
-            Cast(Of DataRow).
-            Select(Function(r As DataRow) r.Item("VALUE").ToString()).
-            ToList()
-
-            Dim oBuffer As Byte() = ReadEnvelope(pEnvelopeId)
-
-#End Region
-
-            Return PDFBurner.BurnAnnotsToPDF(oBuffer, oJsonList, pEnvelopeId)
+            Return PDFBurner.BurnAnnotsToPDF(oInputDocumentBuffer, oAnnotations, pEnvelopeData.EnvelopeId)
        End Function

        Private Function GetEnvelopeData(pEnvelopeId As Integer) As EnvelopeData
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFBurner.vb
@@ -85,37 +85,16 @@ Namespace Jobs.FinalizeDocument

                    'Add annotations
                    For Each element In elements
-                        If element Is Nothing Then
-                            Continue For
-                        End If
-
-                        Dim elementAnnotations = If(element.Annotations, Enumerable.Empty(Of ElementAnnotation)())
-                        If Not elementAnnotations.Any() Then
-                            Continue For
-                        End If

                        Dim frameX = (element.Left - 0.7 - margin)

-                        Dim frame = elementAnnotations.FirstOrDefault(Function(a) a.Name = "frame")
+                        Dim frame = element.Annotations.FirstOrDefault(Function(a) a.Name = "frame")
                        Dim frameY = element.Top - 0.5 - margin
-                        Dim frameYShift As Double = 0
-                        Dim frameXShift As Double = 0
-
-                        If frame IsNot Nothing Then
-                            frameYShift = frame.Y - frameY * inchFactor
-                            frameXShift = frame.X - frameX * inchFactor
-                        End If
-
-                        For Each annot In elementAnnotations
-                            If annot Is Nothing Then
-                                Continue For
-                            End If
-
-                            Dim yOffsetofFF As Double = 0
-                            If Not String.IsNullOrEmpty(annot.Name) Then
-                                yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF)
-                            End If
+                        Dim frameYShift = frame.Y - frameY * inchFactor
+                        Dim frameXShift = frame.X - frameX * inchFactor

+                        For Each annot In element.Annotations
+                            Dim yOffsetofFF As Double = If(yOffsetsOfFF.TryGetValue(annot.Name, yOffsetofFF), yOffsetofFF, 0)
                            Dim y = frameY + yOffsetofFF

                            If annot.Type = AnnotationType.FormField Then
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/PDFMerger.vb
@@ -56,7 +56,7 @@ Public Class PDFMerger

                            ' Convert to PDF/A
                            oMergedPDF.ConvertToPDFA(oFinalStream, PDFAConformanceLevel, ALLOW_VECTORIZATION, ALLOW_RASTERIZATION)
-                            oStatus = oMergedPDF.GetStat()
+                            oStatus = oDocumentPDF.GetStat()
                            If oStatus <> GdPictureStatus.OK Then
                                Throw New MergeDocumentException($"Document could not be converted to PDF/A: {oStatus}")
                            End If
--- a/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb
+++ b/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb
@@ -270,26 +270,12 @@ Public Class ReceiverModel
    Private Function GetSignedDate(pEmailAddress As String, pEnvelopeId As Integer) As Date
        Try
            Dim oStatusInt As Integer = EnvelopeStatus.DocumentSigned
-            Dim value = Database.GetScalarValue($"SELECT ACTION_DATE FROM [DD_ECM].[dbo].[TBSIG_ENVELOPE_HISTORY] WHERE ENVELOPE_ID = {pEnvelopeId}
+            Return Database.GetScalarValue($"SELECT ACTION_DATE FROM [DD_ECM].[dbo].[TBSIG_ENVELOPE_HISTORY] WHERE ENVELOPE_ID = {pEnvelopeId}
                                                And USER_REFERENCE = '{pEmailAddress}' AND [STATUS] = {oStatusInt}")

-            If value Is Nothing OrElse value Is DBNull.Value Then
-                Return DateTime.MinValue
-            End If
-
-            If TypeOf value Is DateTime Then
-                Return DirectCast(value, DateTime)
-            End If
-
-            Dim parsedDate As DateTime
-            If DateTime.TryParse(value.ToString(), parsedDate) Then
-                Return parsedDate
-            End If
-
-            Return DateTime.MinValue
        Catch ex As Exception
            Logger.Error(ex)
-            Return DateTime.MinValue
+            Return Nothing
        End Try
    End Function

--- a/EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb
+++ b/EnvelopeGenerator.CommonServices/Strings/Model.Designer.vb
@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------

@@ -15,12 +15,12 @@ Imports System

 Namespace My.Resources
    
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
+    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -37,7 +37,7 @@ Namespace My.Resources
        End Sub
        
        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Public Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -51,8 +51,8 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
+        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Public Shared Property Culture() As Global.System.Globalization.CultureInfo
@@ -65,7 +65,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode korrekt eingegeben.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode korrekt eingegeben ähnelt.
        '''</summary>
        Public Shared ReadOnly Property AccessCodeCorrect() As String
            Get
@@ -74,7 +74,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode falsch eingegeben.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode falsch eingegeben ähnelt.
        '''</summary>
        Public Shared ReadOnly Property AccessCodeIncorrect() As String
            Get
@@ -83,7 +83,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode angefordert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode angefordert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property AccessCodeRequested() As String
            Get
@@ -92,7 +92,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Fortgeschrittene Elektronische Signatur.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Fortgeschrittene Elektronische Signatur ähnelt.
        '''</summary>
        Public Shared ReadOnly Property AdvancedElectronicSignature() As String
            Get
@@ -101,7 +101,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Abgeschlossen.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Abgeschlossen ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Completed() As String
            Get
@@ -110,16 +110,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Vollständig bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property CompletelyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("CompletelyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Vollständig signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vollständig Signiert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property CompletelySigned() As String
            Get
@@ -128,25 +119,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung.
-        '''</summary>
-        Public Shared ReadOnly Property Confirmation() As String
-            Get
-                Return ResourceManager.GetString("Confirmation", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Gelesen und Bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property Confirmed() As String
-            Get
-                Return ResourceManager.GetString("Confirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Vertrag.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vertrag ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Contract() As String
            Get
@@ -155,7 +128,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Erstellt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Erstellt ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Created() As String
            Get
@@ -164,16 +137,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Dokument gelesen und bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property DocumentConfirmed() As String
-            Get
-                Return ResourceManager.GetString("DocumentConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Dokument Rotation geändert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property DocumentMod_Rotation() As String
            Get
@@ -182,7 +146,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Dokument geöffnet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property DocumentOpened() As String
            Get
@@ -191,7 +155,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Unterzeichnung abgelehnt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
        '''</summary>
        Public Shared ReadOnly Property DocumentRejected() As String
            Get
@@ -200,16 +164,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung abgelehnt.
-        '''</summary>
-        Public Shared ReadOnly Property DocumentRejectedRaC() As String
-            Get
-                Return ResourceManager.GetString("DocumentRejectedRaC", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Dokument unterzeichnet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property DocumentSigned() As String
            Get
@@ -218,7 +173,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Entwurf.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Entwurf ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Draft() As String
            Get
@@ -227,7 +182,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Archiviert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Archiviert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeArchived() As String
            Get
@@ -236,16 +191,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Vollständig bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property EnvelopeCompletelyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("EnvelopeCompletelyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Vollständig signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Vollständig signiert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeCompletelySigned() As String
            Get
@@ -254,7 +200,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Umschlag Erstellt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag Erstellt ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeCreated() As String
            Get
@@ -263,7 +209,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Umschlag Gelöscht.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag Gelöscht ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeDeleted() As String
            Get
@@ -272,16 +218,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Teil-Bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property EnvelopePartlyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("EnvelopePartlyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Teil-Signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopePartlySigned() As String
            Get
@@ -290,7 +227,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Umschlag in Queue.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag in Queue ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeQueued() As String
            Get
@@ -299,7 +236,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Umschlag abgelehnt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeRejected() As String
            Get
@@ -308,7 +245,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Signierungszertifikat erstellt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeReportCreated() As String
            Get
@@ -317,16 +254,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigungszertifikat erstellt.
-        '''</summary>
-        Public Shared ReadOnly Property EnvelopeReportCreatedRaC() As String
-            Get
-                Return ResourceManager.GetString("EnvelopeReportCreatedRaC", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Gespeichert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeSaved() As String
            Get
@@ -335,7 +263,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Gesendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeSent() As String
            Get
@@ -344,7 +272,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Umschlag zurückgezogen.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
        '''</summary>
        Public Shared ReadOnly Property EnvelopeWithdrawn() As String
            Get
@@ -353,7 +281,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Zugriffscode versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property MessageAccessCodeSent() As String
            Get
@@ -362,7 +290,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Abschlussemail versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Abschlussemail versendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property MessageCompletionSent() As String
            Get
@@ -371,7 +299,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Signaturbestätigung versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signaturbestätigung versendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property MessageConfirmationSent() As String
            Get
@@ -380,16 +308,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung versendet.
-        '''</summary>
-        Public Shared ReadOnly Property MessageConfirmationSentRaC() As String
-            Get
-                Return ResourceManager.GetString("MessageConfirmationSentRaC", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Löschinformation versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property MessageDeletionSent() As String
            Get
@@ -398,7 +317,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Dokumentenlink versendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokumentenlink versendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property MessageInvitationSent() As String
            Get
@@ -407,7 +326,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Nein.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Nein ähnelt.
        '''</summary>
        Public Shared ReadOnly Property No() As String
            Get
@@ -416,16 +335,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Teil-Bestätigt.
-        '''</summary>
-        Public Shared ReadOnly Property PartlyConfirmed() As String
-            Get
-                Return ResourceManager.GetString("PartlyConfirmed", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Teil-Signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property PartlySigned() As String
            Get
@@ -434,7 +344,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Qualifizierte Signatur.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
        '''</summary>
        Public Shared ReadOnly Property QualifiedSignature() As String
            Get
@@ -443,7 +353,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Lesebestätigung.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
        '''</summary>
        Public Shared ReadOnly Property ReadAndSign() As String
            Get
@@ -452,7 +362,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
        '''</summary>
        Public Shared ReadOnly Property ResetTOTPUser() As String
            Get
@@ -461,7 +371,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Gespeichert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Saved() As String
            Get
@@ -470,7 +380,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Gesendet.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Sent() As String
            Get
@@ -479,7 +389,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Signatur.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signatur ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Signature() As String
            Get
@@ -488,7 +398,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Abschluss bestätigt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signatur bestätigt ähnelt.
        '''</summary>
        Public Shared ReadOnly Property SignatureConfirmed() As String
            Get
@@ -497,7 +407,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Signiert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Signiert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Signed() As String
            Get
@@ -506,7 +416,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Erfolgreich! Dialog wird geschlossen..
+        '''  Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Success_FormClose() As String
            Get
@@ -515,7 +425,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Unsigniert.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Unsigned() As String
            Get
@@ -524,7 +434,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Ja.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Ja ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Yes() As String
            Get
@@ -533,7 +443,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Looks up a localized string similar to Ja, mit Anhang.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Ja, mit Anhang ähnelt.
        '''</summary>
        Public Shared ReadOnly Property YesWithAttachment() As String
            Get
--- a/EnvelopeGenerator.CommonServices/Strings/Model.en.resx
+++ b/EnvelopeGenerator.CommonServices/Strings/Model.en.resx
@@ -132,27 +132,12 @@
  <data name="Completed" xml:space="preserve">
    <value>Completed</value>
  </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
-  <data name="CompletelySigned" xml:space="preserve">
-    <value>Completely signed</value>
-  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Read Confirmation</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Read and signed</value>
-  </data>
  <data name="Contract" xml:space="preserve">
    <value>Contract</value>
  </data>
  <data name="Created" xml:space="preserve">
    <value>Created</value>
  </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Document read and confirmed</value>
-  </data>
  <data name="DocumentMod_Rotation" xml:space="preserve">
    <value>Document rotation adapted</value>
  </data>
@@ -162,9 +147,6 @@
  <data name="DocumentRejected" xml:space="preserve">
    <value>Signing rejected</value>
  </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Read confirmation rejected</value>
-  </data>
  <data name="DocumentSigned" xml:space="preserve">
    <value>Document signed</value>
  </data>
@@ -174,9 +156,6 @@
  <data name="EnvelopeArchived" xml:space="preserve">
    <value>Archived</value>
  </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
  <data name="EnvelopeCompletelySigned" xml:space="preserve">
    <value>Completely signed</value>
  </data>
@@ -186,11 +165,8 @@
  <data name="EnvelopeDeleted" xml:space="preserve">
    <value>Envelope Deleted</value>
  </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
  <data name="EnvelopePartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
+    <value>Partly signed</value>
  </data>
  <data name="EnvelopeQueued" xml:space="preserve">
    <value>Envelope Queued</value>
@@ -201,9 +177,6 @@
  <data name="EnvelopeReportCreated" xml:space="preserve">
    <value>Signature certificate created</value>
  </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Read Confirmation Certificate Created</value>
-  </data>
  <data name="EnvelopeSaved" xml:space="preserve">
    <value>Saved</value>
  </data>
@@ -222,9 +195,6 @@
  <data name="MessageConfirmationSent" xml:space="preserve">
    <value>Confirmation Sent</value>
  </data>
-  <data name="MessageConfirmationSentRaC" xml:space="preserve">
-    <value>Read Confirmation Sent</value>
-  </data>
  <data name="MessageDeletionSent" xml:space="preserve">
    <value>Deletion Notice Sent</value>
  </data>
@@ -234,12 +204,6 @@
  <data name="No" xml:space="preserve">
    <value>No</value>
  </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
-  <data name="PartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
-  </data>
  <data name="QualifiedSignature" xml:space="preserve">
    <value>Qualified Signature</value>
  </data>
@@ -259,7 +223,7 @@
    <value>Signature</value>
  </data>
  <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Finalization confirmed</value>
+    <value>Signature confirmed</value>
  </data>
  <data name="Signed" xml:space="preserve">
    <value>Signed</value>
--- a/EnvelopeGenerator.CommonServices/Strings/Model.resx
+++ b/EnvelopeGenerator.CommonServices/Strings/Model.resx
@@ -132,17 +132,8 @@
  <data name="Completed" xml:space="preserve">
    <value>Abgeschlossen</value>
  </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig bestätigt</value>
-  </data>
  <data name="CompletelySigned" xml:space="preserve">
-    <value>Vollständig signiert</value>
-  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Lesebestätigung</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Gelesen und Bestätigt</value>
+    <value>Vollständig Signiert</value>
  </data>
  <data name="Contract" xml:space="preserve">
    <value>Vertrag</value>
@@ -150,9 +141,6 @@
  <data name="Created" xml:space="preserve">
    <value>Erstellt</value>
  </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Dokument gelesen und bestätigt</value>
-  </data>
  <data name="DocumentMod_Rotation" xml:space="preserve">
    <value>Dokument Rotation geändert</value>
  </data>
@@ -162,9 +150,6 @@
  <data name="DocumentRejected" xml:space="preserve">
    <value>Unterzeichnung abgelehnt</value>
  </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Lesebestätigung abgelehnt</value>
-  </data>
  <data name="DocumentSigned" xml:space="preserve">
    <value>Dokument unterzeichnet</value>
  </data>
@@ -174,9 +159,6 @@
  <data name="EnvelopeArchived" xml:space="preserve">
    <value>Archiviert</value>
  </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig bestätigt</value>
-  </data>
  <data name="EnvelopeCompletelySigned" xml:space="preserve">
    <value>Vollständig signiert</value>
  </data>
@@ -186,9 +168,6 @@
  <data name="EnvelopeDeleted" xml:space="preserve">
    <value>Umschlag Gelöscht</value>
  </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
  <data name="EnvelopePartlySigned" xml:space="preserve">
    <value>Teil-Signiert</value>
  </data>
@@ -201,9 +180,6 @@
  <data name="EnvelopeReportCreated" xml:space="preserve">
    <value>Signierungszertifikat erstellt</value>
  </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Lesebestätigungszertifikat erstellt</value>
-  </data>
  <data name="EnvelopeSaved" xml:space="preserve">
    <value>Gespeichert</value>
  </data>
@@ -222,9 +198,6 @@
  <data name="MessageConfirmationSent" xml:space="preserve">
    <value>Signaturbestätigung versendet</value>
  </data>
-  <data name="MessageConfirmationSentRaC" xml:space="preserve">
-    <value>Lesebestätigung versendet</value>
-  </data>
  <data name="MessageDeletionSent" xml:space="preserve">
    <value>Löschinformation versendet</value>
  </data>
@@ -234,9 +207,6 @@
  <data name="No" xml:space="preserve">
    <value>Nein</value>
  </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
  <data name="PartlySigned" xml:space="preserve">
    <value>Teil-Signiert</value>
  </data>
@@ -244,7 +214,7 @@
    <value>Qualifizierte Signatur</value>
  </data>
  <data name="ReadAndSign" xml:space="preserve">
-    <value>Lesebestätigung</value>
+    <value>Arbeitsanweisung</value>
  </data>
  <data name="ResetTOTPUser" xml:space="preserve">
    <value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
@@ -259,7 +229,7 @@
    <value>Signatur</value>
  </data>
  <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Abschluss bestätigt</value>
+    <value>Signatur bestätigt</value>
  </data>
  <data name="Signed" xml:space="preserve">
    <value>Signiert</value>
--- a/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
+++ b/EnvelopeGenerator.Domain/Entities/DocumentStatus.cs
@@ -35,9 +35,6 @@ namespace EnvelopeGenerator.Domain.Entities
        [Column("STATUS")]
        public Constants.DocumentStatus Status { get; set; }

-        [Column("STATUS_CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? StatusChangedWhen { get; set; }
-
        [Required]
        [Column("ADDED_WHEN", TypeName = "datetime")]
        public DateTime AddedWhen { get; set; }
--- a/EnvelopeGenerator.Domain/Entities/Envelope.cs
+++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs
@@ -5,7 +5,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 using EnvelopeGenerator.Domain.Constants;
 using Newtonsoft.Json;
 using EnvelopeGenerator.Domain.Interfaces.Auditing;
-using EnvelopeGenerator.Domain.Interfaces;
 #if NETFRAMEWORK
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +13,7 @@ using System.Linq;
 namespace EnvelopeGenerator.Domain.Entities
 {
    [Table("TBSIG_ENVELOPE", Schema = "dbo")]
-    public class Envelope : IHasAddedWhen, IHasChangedWhen, IEnvelope
+    public class Envelope : IHasAddedWhen, IHasChangedWhen
    {
        public Envelope()
        {
@@ -107,8 +106,7 @@ namespace EnvelopeGenerator.Domain.Entities

        [JsonIgnore]
        [NotMapped]
-        [Obsolete("Use EnvelopeGenerator.Domain.Interfaces.EnvelopeExtensions.IsReadAndConfirm extension method instead.")]
-        public bool ReadOnly => this.IsReadAndConfirm();
+        public bool ReadOnly => EnvelopeTypeId == 2;

        [Column("CERTIFICATION_TYPE")]
        public int? CertificationType { get; set; }
--- a/EnvelopeGenerator.Domain/Entities/History.cs
+++ b/EnvelopeGenerator.Domain/Entities/History.cs
@@ -35,11 +35,8 @@ namespace EnvelopeGenerator.Domain.Entities
        public DateTime AddedWhen { get; set; }

        [Column("ACTION_DATE", TypeName = "datetime")]
-        public DateTime? ActionDate { get; set; }
-
-        [NotMapped]
-        public DateTime? ChangedWhen { get => ActionDate; set => ActionDate = value; }
-
+        public DateTime? ChangedWhen { get; set; }
+        
        [Column("COMMENT", TypeName = "nvarchar(max)")]
        public string
 #if nullable
--- a/EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs
+++ b/EnvelopeGenerator.Domain/Interfaces/IEnvelope.cs
@@ -1,20 +0,0 @@
-namespace EnvelopeGenerator.Domain.Interfaces
-{
-    public interface IEnvelope
-    {
-        int? EnvelopeTypeId { get; set; }
-    }
-
-    public static class EnvelopeExtensions
-    {
-        public static bool IsReadAndConfirm(this IEnvelope envelope)
-        {
-            return envelope.EnvelopeTypeId == 2;
-        }
-
-        public static bool IsReadAndSign(this IEnvelope envelope)
-        {
-            return envelope.EnvelopeTypeId != 2;
-        }
-    }
-}
--- a/EnvelopeGenerator.Domain/Resources/Model.Designer.cs
+++ b/EnvelopeGenerator.Domain/Resources/Model.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------

@@ -13,12 +13,12 @@ namespace My.Resources {
    
    
    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        public static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        public static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode korrekt eingegeben.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode korrekt eingegeben ähnelt.
        /// </summary>
        public static string AccessCodeCorrect {
            get {
@@ -70,7 +70,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode falsch eingegeben.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode falsch eingegeben ähnelt.
        /// </summary>
        public static string AccessCodeIncorrect {
            get {
@@ -79,7 +79,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode angefordert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode angefordert ähnelt.
        /// </summary>
        public static string AccessCodeRequested {
            get {
@@ -88,7 +88,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Fortgeschrittene Elektronische Signatur.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Fortgeschrittene Elektronische Signatur ähnelt.
        /// </summary>
        public static string AdvancedElectronicSignature {
            get {
@@ -97,7 +97,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Abgeschlossen.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Abgeschlossen ähnelt.
        /// </summary>
        public static string Completed {
            get {
@@ -106,16 +106,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Vollständig bestätigt.
-        /// </summary>
-        public static string CompletelyConfirmed {
-            get {
-                return ResourceManager.GetString("CompletelyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vollständig signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vollständig Signiert ähnelt.
        /// </summary>
        public static string CompletelySigned {
            get {
@@ -124,25 +115,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigung.
-        /// </summary>
-        public static string Confirmation {
-            get {
-                return ResourceManager.GetString("Confirmation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Gelesen und bestätigt.
-        /// </summary>
-        public static string Confirmed {
-            get {
-                return ResourceManager.GetString("Confirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vertrag.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vertrag ähnelt.
        /// </summary>
        public static string Contract {
            get {
@@ -151,7 +124,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Erstellt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Erstellt ähnelt.
        /// </summary>
        public static string Created {
            get {
@@ -160,16 +133,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Dokument gelesen und bestätigt.
-        /// </summary>
-        public static string DocumentConfirmed {
-            get {
-                return ResourceManager.GetString("DocumentConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Dokument Rotation geändert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
        /// </summary>
        public static string DocumentMod_Rotation {
            get {
@@ -178,7 +142,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Dokument geöffnet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
        /// </summary>
        public static string DocumentOpened {
            get {
@@ -187,7 +151,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Unterzeichnung abgelehnt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
        /// </summary>
        public static string DocumentRejected {
            get {
@@ -196,16 +160,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigung abgelehnt.
-        /// </summary>
-        public static string DocumentRejectedRaC {
-            get {
-                return ResourceManager.GetString("DocumentRejectedRaC", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Dokument unterzeichnet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
        /// </summary>
        public static string DocumentSigned {
            get {
@@ -214,7 +169,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Entwurf.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Entwurf ähnelt.
        /// </summary>
        public static string Draft {
            get {
@@ -223,7 +178,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Archiviert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Archiviert ähnelt.
        /// </summary>
        public static string EnvelopeArchived {
            get {
@@ -232,16 +187,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Vollständig gelesen und bestätigt.
-        /// </summary>
-        public static string EnvelopeCompletelyConfirmed {
-            get {
-                return ResourceManager.GetString("EnvelopeCompletelyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Vollständig signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Vollständig signiert ähnelt.
        /// </summary>
        public static string EnvelopeCompletelySigned {
            get {
@@ -250,7 +196,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Umschlag Erstellt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag Erstellt ähnelt.
        /// </summary>
        public static string EnvelopeCreated {
            get {
@@ -259,7 +205,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Umschlag Gelöscht.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag Gelöscht ähnelt.
        /// </summary>
        public static string EnvelopeDeleted {
            get {
@@ -268,16 +214,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Teil-Bestätigt.
-        /// </summary>
-        public static string EnvelopePartlyConfirmed {
-            get {
-                return ResourceManager.GetString("EnvelopePartlyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Teil-Signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
        /// </summary>
        public static string EnvelopePartlySigned {
            get {
@@ -286,7 +223,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Umschlag in Queue.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag in Queue ähnelt.
        /// </summary>
        public static string EnvelopeQueued {
            get {
@@ -295,7 +232,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Umschlag abgelehnt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
        /// </summary>
        public static string EnvelopeRejected {
            get {
@@ -304,7 +241,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Signierungszertifikat erstellt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
        /// </summary>
        public static string EnvelopeReportCreated {
            get {
@@ -313,16 +250,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigungszertifikat erstellt.
-        /// </summary>
-        public static string EnvelopeReportCreatedRaC {
-            get {
-                return ResourceManager.GetString("EnvelopeReportCreatedRaC", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Gespeichert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
        /// </summary>
        public static string EnvelopeSaved {
            get {
@@ -331,7 +259,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Gesendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
        /// </summary>
        public static string EnvelopeSent {
            get {
@@ -340,7 +268,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Umschlag zurückgezogen.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
        /// </summary>
        public static string EnvelopeWithdrawn {
            get {
@@ -349,7 +277,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Zugriffscode versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
        /// </summary>
        public static string MessageAccessCodeSent {
            get {
@@ -358,7 +286,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Abschlussemail versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Abschlussemail versendet ähnelt.
        /// </summary>
        public static string MessageCompletionSent {
            get {
@@ -367,7 +295,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Abschlussbestätigung versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signaturbestätigung versendet ähnelt.
        /// </summary>
        public static string MessageConfirmationSent {
            get {
@@ -376,7 +304,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Löschinformation versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Löschinformation versendet ähnelt.
        /// </summary>
        public static string MessageDeletionSent {
            get {
@@ -385,7 +313,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Dokumentenlink versendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Dokumentenlink versendet ähnelt.
        /// </summary>
        public static string MessageInvitationSent {
            get {
@@ -394,7 +322,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Nein.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Nein ähnelt.
        /// </summary>
        public static string No {
            get {
@@ -403,16 +331,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Teil-Bestätigt.
-        /// </summary>
-        public static string PartlyConfirmed {
-            get {
-                return ResourceManager.GetString("PartlyConfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Teil-Signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
        /// </summary>
        public static string PartlySigned {
            get {
@@ -421,7 +340,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Qualifizierte Signatur.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Qualifizierte Signatur ähnelt.
        /// </summary>
        public static string QualifiedSignature {
            get {
@@ -430,7 +349,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Lesebestätigung.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Arbeitsanweisung ähnelt.
        /// </summary>
        public static string ReadAndSign {
            get {
@@ -439,7 +358,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren! ähnelt.
        /// </summary>
        public static string ResetTOTPUser {
            get {
@@ -448,7 +367,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Gespeichert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gespeichert ähnelt.
        /// </summary>
        public static string Saved {
            get {
@@ -457,7 +376,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Gesendet.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Gesendet ähnelt.
        /// </summary>
        public static string Sent {
            get {
@@ -466,7 +385,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Signatur.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signatur ähnelt.
        /// </summary>
        public static string Signature {
            get {
@@ -475,7 +394,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Abschluss bestätigt.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signatur bestätigt ähnelt.
        /// </summary>
        public static string SignatureConfirmed {
            get {
@@ -484,7 +403,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Signiert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Signiert ähnelt.
        /// </summary>
        public static string Signed {
            get {
@@ -493,7 +412,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Erfolgreich! Dialog wird geschlossen..
+        ///   Sucht eine lokalisierte Zeichenfolge, die Erfolgreich! Dialog wird geschlossen. ähnelt.
        /// </summary>
        public static string Success_FormClose {
            get {
@@ -502,16 +421,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Unbestätigt.
-        /// </summary>
-        public static string Unconfirmed {
-            get {
-                return ResourceManager.GetString("Unconfirmed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsigniert.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Unsigniert ähnelt.
        /// </summary>
        public static string Unsigned {
            get {
@@ -520,7 +430,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Ja.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Ja ähnelt.
        /// </summary>
        public static string Yes {
            get {
@@ -529,7 +439,7 @@ namespace My.Resources {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Ja, mit Anhang.
+        ///   Sucht eine lokalisierte Zeichenfolge, die Ja, mit Anhang ähnelt.
        /// </summary>
        public static string YesWithAttachment {
            get {
--- a/EnvelopeGenerator.Domain/Resources/Model.en.resx
+++ b/EnvelopeGenerator.Domain/Resources/Model.en.resx
@@ -132,27 +132,15 @@
  <data name="Completed" xml:space="preserve">
    <value>Completed</value>
  </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
  <data name="CompletelySigned" xml:space="preserve">
    <value>Completely signed</value>
  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Read Confirmation</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Read and signed</value>
-  </data>
  <data name="Contract" xml:space="preserve">
    <value>Contract</value>
  </data>
  <data name="Created" xml:space="preserve">
    <value>Created</value>
  </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Document read and signed</value>
-  </data>
  <data name="DocumentMod_Rotation" xml:space="preserve">
    <value>Document rotation adapted</value>
  </data>
@@ -162,9 +150,6 @@
  <data name="DocumentRejected" xml:space="preserve">
    <value>Signing rejected</value>
  </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Read confirmation rejected</value>
-  </data>
  <data name="DocumentSigned" xml:space="preserve">
    <value>Document signed</value>
  </data>
@@ -174,9 +159,6 @@
  <data name="EnvelopeArchived" xml:space="preserve">
    <value>Archived</value>
  </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Completely confirmed</value>
-  </data>
  <data name="EnvelopeCompletelySigned" xml:space="preserve">
    <value>Completely signed</value>
  </data>
@@ -186,11 +168,8 @@
  <data name="EnvelopeDeleted" xml:space="preserve">
    <value>Envelope Deleted</value>
  </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
  <data name="EnvelopePartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
+    <value>Partly signed</value>
  </data>
  <data name="EnvelopeQueued" xml:space="preserve">
    <value>Envelope Queued</value>
@@ -201,9 +180,6 @@
  <data name="EnvelopeReportCreated" xml:space="preserve">
    <value>Signature certificate created</value>
  </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Read confirmartion certificate created</value>
-  </data>
  <data name="EnvelopeSaved" xml:space="preserve">
    <value>Saved</value>
  </data>
@@ -220,7 +196,7 @@
    <value>Final email sent</value>
  </data>
  <data name="MessageConfirmationSent" xml:space="preserve">
-    <value>Finalization Confirmation Sent</value>
+    <value>Confirmation Sent</value>
  </data>
  <data name="MessageDeletionSent" xml:space="preserve">
    <value>Deletion Notice Sent</value>
@@ -231,12 +207,6 @@
  <data name="No" xml:space="preserve">
    <value>No</value>
  </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Partially confirmed</value>
-  </data>
-  <data name="PartlySigned" xml:space="preserve">
-    <value>Partially signed</value>
-  </data>
  <data name="QualifiedSignature" xml:space="preserve">
    <value>Qualified Signature</value>
  </data>
@@ -256,7 +226,7 @@
    <value>Signature</value>
  </data>
  <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Finalization confirmed</value>
+    <value>Signature confirmed</value>
  </data>
  <data name="Signed" xml:space="preserve">
    <value>Signed</value>
@@ -264,9 +234,6 @@
  <data name="Success_FormClose" xml:space="preserve">
    <value>Successful! Dialog is closed.successful! Dialog is closed.</value>
  </data>
-  <data name="Unconfirmed" xml:space="preserve">
-    <value>Unconfirmed</value>
-  </data>
  <data name="Unsigned" xml:space="preserve">
    <value>Unsigned</value>
  </data>
--- a/EnvelopeGenerator.Domain/Resources/Model.resx
+++ b/EnvelopeGenerator.Domain/Resources/Model.resx
@@ -132,17 +132,8 @@
  <data name="Completed" xml:space="preserve">
    <value>Abgeschlossen</value>
  </data>
-  <data name="CompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig bestätigt</value>
-  </data>
  <data name="CompletelySigned" xml:space="preserve">
-    <value>Vollständig signiert</value>
-  </data>
-  <data name="Confirmation" xml:space="preserve">
-    <value>Lesebestätigung</value>
-  </data>
-  <data name="Confirmed" xml:space="preserve">
-    <value>Gelesen und bestätigt</value>
+    <value>Vollständig Signiert</value>
  </data>
  <data name="Contract" xml:space="preserve">
    <value>Vertrag</value>
@@ -150,9 +141,6 @@
  <data name="Created" xml:space="preserve">
    <value>Erstellt</value>
  </data>
-  <data name="DocumentConfirmed" xml:space="preserve">
-    <value>Dokument gelesen und bestätigt</value>
-  </data>
  <data name="DocumentMod_Rotation" xml:space="preserve">
    <value>Dokument Rotation geändert</value>
  </data>
@@ -162,9 +150,6 @@
  <data name="DocumentRejected" xml:space="preserve">
    <value>Unterzeichnung abgelehnt</value>
  </data>
-  <data name="DocumentRejectedRaC" xml:space="preserve">
-    <value>Lesebestätigung abgelehnt</value>
-  </data>
  <data name="DocumentSigned" xml:space="preserve">
    <value>Dokument unterzeichnet</value>
  </data>
@@ -174,9 +159,6 @@
  <data name="EnvelopeArchived" xml:space="preserve">
    <value>Archiviert</value>
  </data>
-  <data name="EnvelopeCompletelyConfirmed" xml:space="preserve">
-    <value>Vollständig gelesen und bestätigt</value>
-  </data>
  <data name="EnvelopeCompletelySigned" xml:space="preserve">
    <value>Vollständig signiert</value>
  </data>
@@ -186,9 +168,6 @@
  <data name="EnvelopeDeleted" xml:space="preserve">
    <value>Umschlag Gelöscht</value>
  </data>
-  <data name="EnvelopePartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
  <data name="EnvelopePartlySigned" xml:space="preserve">
    <value>Teil-Signiert</value>
  </data>
@@ -201,9 +180,6 @@
  <data name="EnvelopeReportCreated" xml:space="preserve">
    <value>Signierungszertifikat erstellt</value>
  </data>
-  <data name="EnvelopeReportCreatedRaC" xml:space="preserve">
-    <value>Lesebestätigungszertifikat erstellt</value>
-  </data>
  <data name="EnvelopeSaved" xml:space="preserve">
    <value>Gespeichert</value>
  </data>
@@ -220,7 +196,7 @@
    <value>Abschlussemail versendet</value>
  </data>
  <data name="MessageConfirmationSent" xml:space="preserve">
-    <value>Abschlussbestätigung versendet</value>
+    <value>Signaturbestätigung versendet</value>
  </data>
  <data name="MessageDeletionSent" xml:space="preserve">
    <value>Löschinformation versendet</value>
@@ -231,9 +207,6 @@
  <data name="No" xml:space="preserve">
    <value>Nein</value>
  </data>
-  <data name="PartlyConfirmed" xml:space="preserve">
-    <value>Teil-Bestätigt</value>
-  </data>
  <data name="PartlySigned" xml:space="preserve">
    <value>Teil-Signiert</value>
  </data>
@@ -241,7 +214,7 @@
    <value>Qualifizierte Signatur</value>
  </data>
  <data name="ReadAndSign" xml:space="preserve">
-    <value>Lesebestätigung</value>
+    <value>Arbeitsanweisung</value>
  </data>
  <data name="ResetTOTPUser" xml:space="preserve">
    <value>Wollen Sie die 2-Faktor Definition für diesen Empfänger zurücksetzen. Der Empfänger muss sich dann neu identifizieren!</value>
@@ -256,7 +229,7 @@
    <value>Signatur</value>
  </data>
  <data name="SignatureConfirmed" xml:space="preserve">
-    <value>Abschluss bestätigt</value>
+    <value>Signatur bestätigt</value>
  </data>
  <data name="Signed" xml:space="preserve">
    <value>Signiert</value>
@@ -264,9 +237,6 @@
  <data name="Success_FormClose" xml:space="preserve">
    <value>Erfolgreich! Dialog wird geschlossen.</value>
  </data>
-  <data name="Unconfirmed" xml:space="preserve">
-    <value>Unbestätigt</value>
-  </data>
  <data name="Unsigned" xml:space="preserve">
    <value>Unsigniert</value>
  </data>
--- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs
+++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs
@@ -47,8 +47,6 @@ public abstract class EGDbContextBase : DbContext

    public DbSet<Signature> DocumentReceiverElements { get; set; }

-    public DbSet<ElementAnnotation> DocumentReceiverElementAnnotations { get; set; }
-
    public DbSet<DocumentStatus> DocumentStatus { get; set; }

    public DbSet<EmailTemplate> EmailTemplate { get; set; }
--- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
+++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj
@@ -25,7 +25,7 @@
    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.6.0" />
    <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.6.1" />
    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
    <PackageReference Include="QuestPDF" Version="2025.7.1" />
    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
--- a/EnvelopeGenerator.Jobs/EnvelopeGenerator.Jobs.csproj
+++ b/EnvelopeGenerator.Jobs/EnvelopeGenerator.Jobs.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
+    <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.82.1" />
+    <PackageReference Include="Quartz" Version="3.9.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.Infrastructure\EnvelopeGenerator.Infrastructure.csproj" />
+    <ProjectReference Include="..\EnvelopeGenerator.PdfEditor\EnvelopeGenerator.PdfEditor.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/EnvelopeGenerator.Jobs/Jobs/APIBackendJobs/APIEnvelopeJob.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/APIBackendJobs/APIEnvelopeJob.cs
@@ -0,0 +1,151 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using EnvelopeGenerator.Domain.Constants;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Quartz;
+
+namespace EnvelopeGenerator.Jobs.APIBackendJobs;
+
+public class APIEnvelopeJob(ILogger<APIEnvelopeJob>? logger = null) : IJob
+{
+    private readonly ILogger<APIEnvelopeJob> _logger = logger ?? NullLogger<APIEnvelopeJob>.Instance;
+
+    public async Task Execute(IJobExecutionContext context)
+    {
+        var jobId = context.JobDetail.Key.ToString();
+        _logger.LogDebug("API Envelopes - Starting job {JobId}", jobId);
+
+        try
+        {
+            var connectionString = context.MergedJobDataMap.GetString(Value.DATABASE);
+            if (string.IsNullOrWhiteSpace(connectionString))
+            {
+                _logger.LogWarning("API Envelopes - Connection string missing");
+                return;
+            }
+
+            await using var connection = new SqlConnection(connectionString);
+            await connection.OpenAsync(context.CancellationToken);
+
+            await ProcessInvitationsAsync(connection, context.CancellationToken);
+            await ProcessWithdrawnAsync(connection, context.CancellationToken);
+
+            _logger.LogDebug("API Envelopes - Completed job {JobId} successfully", jobId);
+        }
+        catch (System.Exception ex)
+        {
+            _logger.LogError(ex, "API Envelopes job failed");
+        }
+        finally
+        {
+            _logger.LogDebug("API Envelopes execution for {JobId} ended", jobId);
+        }
+    }
+
+    private async Task ProcessInvitationsAsync(SqlConnection connection, System.Threading.CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT GUID FROM TBSIG_ENVELOPE WHERE SOURCE = 'API' AND STATUS = 1003 ORDER BY GUID";
+        var envelopeIds = new List<int>();
+
+        await using (var command = new SqlCommand(sql, connection))
+        await using (var reader = await command.ExecuteReaderAsync(cancellationToken))
+        {
+            while (await reader.ReadAsync(cancellationToken))
+            {
+                if (reader[0] is int id)
+                {
+                    envelopeIds.Add(id);
+                }
+            }
+        }
+
+        if (envelopeIds.Count == 0)
+        {
+            _logger.LogDebug("SendInvMail - No envelopes found");
+            return;
+        }
+
+        _logger.LogInformation("SendInvMail - Found {Count} envelopes", envelopeIds.Count);
+        var total = envelopeIds.Count;
+        var current = 1;
+
+        foreach (var id in envelopeIds)
+        {
+            _logger.LogInformation("SendInvMail - Processing Envelope {EnvelopeId} ({Current}/{Total})", id, current, total);
+            try
+            {
+                // Placeholder for invitation email sending logic.
+                _logger.LogDebug("SendInvMail - Marking envelope {EnvelopeId} as queued", id);
+                const string updateSql = "UPDATE TBSIG_ENVELOPE SET CURRENT_WORK_APP = @App WHERE GUID = @Id";
+                await using var updateCommand = new SqlCommand(updateSql, connection);
+                updateCommand.Parameters.AddWithValue("@App", "signFLOW_API_EnvJob_InvMail");
+                updateCommand.Parameters.AddWithValue("@Id", id);
+                await updateCommand.ExecuteNonQueryAsync(cancellationToken);
+            }
+            catch (System.Exception ex)
+            {
+                _logger.LogWarning(ex, "SendInvMail - Unhandled exception while working envelope {EnvelopeId}", id);
+            }
+
+            current++;
+            _logger.LogInformation("SendInvMail - Envelope finalized");
+        }
+    }
+
+    private async Task ProcessWithdrawnAsync(SqlConnection connection, System.Threading.CancellationToken cancellationToken)
+    {
+        const string sql = @"SELECT ENV.GUID, REJ.COMMENT AS REJECTION_REASON FROM 
+                (SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = 1009 AND SOURCE = 'API') ENV INNER JOIN
+                (SELECT MAX(GUID) GUID, ENVELOPE_ID, MAX(ADDED_WHEN) ADDED_WHEN, MAX(ACTION_DATE) ACTION_DATE, COMMENT FROM TBSIG_ENVELOPE_HISTORY WHERE STATUS = 1009 GROUP BY ENVELOPE_ID, COMMENT ) REJ ON ENV.GUID = REJ.ENVELOPE_ID LEFT JOIN
+                (SELECT * FROM TBSIG_ENVELOPE_HISTORY WHERE STATUS = 3004 ) M_Send ON ENV.GUID = M_Send.ENVELOPE_ID
+                WHERE M_Send.GUID IS NULL";
+
+        var withdrawn = new List<(int EnvelopeId, string Reason)>();
+        await using (var command = new SqlCommand(sql, connection))
+        await using (var reader = await command.ExecuteReaderAsync(cancellationToken))
+        {
+            while (await reader.ReadAsync(cancellationToken))
+            {
+                var id = reader.GetInt32(0);
+                var reason = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
+                withdrawn.Add((id, reason));
+            }
+        }
+
+        if (withdrawn.Count == 0)
+        {
+            _logger.LogDebug("WithdrawnEnv - No envelopes found");
+            return;
+        }
+
+        _logger.LogInformation("WithdrawnEnv - Found {Count} envelopes", withdrawn.Count);
+        var total = withdrawn.Count;
+        var current = 1;
+
+        foreach (var (envelopeId, reason) in withdrawn)
+        {
+            _logger.LogInformation("WithdrawnEnv - Processing Envelope {EnvelopeId} ({Current}/{Total})", envelopeId, current, total);
+            try
+            {
+                // Log withdrawn mail trigger placeholder
+                const string insertHistory = "INSERT INTO TBSIG_ENVELOPE_HISTORY (ENVELOPE_ID, STATUS, USER_REFERENCE, ADDED_WHEN, ACTION_DATE, COMMENT) VALUES (@EnvelopeId, @Status, @UserReference, GETDATE(), GETDATE(), @Comment)";
+                await using var insertCommand = new SqlCommand(insertHistory, connection);
+                insertCommand.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+                insertCommand.Parameters.AddWithValue("@Status", 3004);
+                insertCommand.Parameters.AddWithValue("@UserReference", "API");
+                insertCommand.Parameters.AddWithValue("@Comment", reason ?? string.Empty);
+                await insertCommand.ExecuteNonQueryAsync(cancellationToken);
+            }
+            catch (System.Exception ex)
+            {
+                _logger.LogWarning(ex, "WithdrawnEnv - Unhandled exception while working envelope {EnvelopeId}", envelopeId);
+            }
+
+            current++;
+            _logger.LogInformation("WithdrawnEnv - Envelope finalized");
+        }
+    }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/DataRowExtensions.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/DataRowExtensions.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Data;
+
+namespace EnvelopeGenerator.Jobs;
+
+public static class DataRowExtensions
+{
+    public static T? GetValueOrDefault<T>(this DataRow row, string columnName, T? defaultValue = default)
+    {
+        if (!row.Table.Columns.Contains(columnName))
+        {
+            return defaultValue;
+        }
+
+        var value = row[columnName];
+        if (value == DBNull.Value)
+        {
+            return defaultValue;
+        }
+
+        try
+        {
+            return (T)Convert.ChangeType(value, typeof(T));
+        }
+        catch
+        {
+            return defaultValue;
+        }
+    }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentExceptions.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentExceptions.cs
@@ -0,0 +1,28 @@
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public static class FinalizeDocumentExceptions
+{
+    public class MergeDocumentException : ApplicationException
+    {
+        public MergeDocumentException(string message) : base(message) { }
+        public MergeDocumentException(string message, Exception innerException) : base(message, innerException) { }
+    }
+
+    public class BurnAnnotationException : ApplicationException
+    {
+        public BurnAnnotationException(string message) : base(message) { }
+        public BurnAnnotationException(string message, Exception innerException) : base(message, innerException) { }
+    }
+
+    public class CreateReportException : ApplicationException
+    {
+        public CreateReportException(string message) : base(message) { }
+        public CreateReportException(string message, Exception innerException) : base(message, innerException) { }
+    }
+
+    public class ExportDocumentException : ApplicationException
+    {
+        public ExportDocumentException(string message) : base(message) { }
+        public ExportDocumentException(string message, Exception innerException) : base(message, innerException) { }
+    }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentJob.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/FinalizeDocumentJob.cs
@@ -0,0 +1,229 @@
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Logging;
+using Quartz;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class FinalizeDocumentJob : IJob
+{
+    private readonly ILogger<FinalizeDocumentJob> _logger;
+    private readonly PDFBurner _pdfBurner;
+    private readonly PDFMerger _pdfMerger;
+    private readonly ReportCreator _reportCreator;
+
+    private record ConfigSettings(string DocumentPath, string DocumentPathOrigin, string ExportPath);
+
+    public FinalizeDocumentJob(
+        ILogger<FinalizeDocumentJob> logger,
+        PDFBurner pdfBurner,
+        PDFMerger pdfMerger,
+        ReportCreator reportCreator)
+    {
+        _logger = logger;
+        _pdfBurner = pdfBurner;
+        _pdfMerger = pdfMerger;
+        _reportCreator = reportCreator;
+    }
+
+    public async Task Execute(IJobExecutionContext context)
+    {
+        var jobId = context.JobDetail.Key.ToString();
+        _logger.LogDebug("Starting job {JobId}", jobId);
+
+        try
+        {
+            var connectionString = context.MergedJobDataMap.GetString(Value.DATABASE);
+            if (string.IsNullOrWhiteSpace(connectionString))
+            {
+                _logger.LogWarning("FinalizeDocument - Connection string missing");
+                return;
+            }
+
+            await using var connection = new SqlConnection(connectionString);
+            await connection.OpenAsync(context.CancellationToken);
+
+            var config = await LoadConfigurationAsync(connection, context.CancellationToken);
+            var envelopes = await LoadCompletedEnvelopesAsync(connection, context.CancellationToken);
+
+            if (envelopes.Count == 0)
+            {
+                _logger.LogInformation("No completed envelopes found");
+                return;
+            }
+
+            var total = envelopes.Count;
+            var current = 1;
+
+            foreach (var envelopeId in envelopes)
+            {
+                _logger.LogInformation("Finalizing Envelope {EnvelopeId} ({Current}/{Total})", envelopeId, current, total);
+                try
+                {
+                    var envelopeData = await GetEnvelopeDataAsync(connection, envelopeId, context.CancellationToken);
+                    if (envelopeData is null)
+                    {
+                        _logger.LogWarning("Envelope data not found for {EnvelopeId}", envelopeId);
+                        continue;
+                    }
+
+                    var data = envelopeData.Value;
+
+                    var envelope = new Envelope
+                    {
+                        Id = envelopeId,
+                        Uuid = data.EnvelopeUuid ?? string.Empty,
+                        Title = data.Title ?? string.Empty,
+                        FinalEmailToCreator = (int)FinalEmailType.No,
+                        FinalEmailToReceivers = (int)FinalEmailType.No
+                    };
+
+                    var burned = _pdfBurner.BurnAnnotsToPDF(data.DocumentBytes, data.AnnotationData, envelopeId);
+                    var report = _reportCreator.CreateReport(connection, envelope);
+                    var merged = _pdfMerger.MergeDocuments(burned, report);
+
+                    var outputDirectory = Path.Combine(config.ExportPath, data.ParentFolderUid);
+                    Directory.CreateDirectory(outputDirectory);
+                    var outputPath = Path.Combine(outputDirectory, $"{envelope.Uuid}.pdf");
+                    await File.WriteAllBytesAsync(outputPath, merged, context.CancellationToken);
+
+                    await UpdateDocumentResultAsync(connection, envelopeId, merged, context.CancellationToken);
+                    await ArchiveEnvelopeAsync(connection, envelopeId, context.CancellationToken);
+                }
+                catch (MergeDocumentException ex)
+                {
+                    _logger.LogWarning(ex, "Certificate Document job failed at merging documents");
+                }
+                catch (ExportDocumentException ex)
+                {
+                    _logger.LogWarning(ex, "Certificate Document job failed at exporting document");
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Unhandled exception while working envelope {EnvelopeId}", envelopeId);
+                }
+
+                current++;
+                _logger.LogInformation("Envelope {EnvelopeId} finalized", envelopeId);
+            }
+
+            _logger.LogDebug("Completed job {JobId} successfully", jobId);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Certificate Document job failed");
+        }
+        finally
+        {
+            _logger.LogDebug("Job execution for {JobId} ended", jobId);
+        }
+    }
+
+    private async Task<ConfigSettings> LoadConfigurationAsync(SqlConnection connection, CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT TOP 1 DOCUMENT_PATH, EXPORT_PATH FROM TBSIG_CONFIG";
+        await using var command = new SqlCommand(sql, connection);
+        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
+        if (await reader.ReadAsync(cancellationToken))
+        {
+            var documentPath = reader.IsDBNull(0) ? string.Empty : reader.GetString(0);
+            var exportPath = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
+            return new ConfigSettings(documentPath, documentPath, exportPath);
+        }
+
+        return new ConfigSettings(string.Empty, string.Empty, Path.GetTempPath());
+    }
+
+    private async Task<List<int>> LoadCompletedEnvelopesAsync(SqlConnection connection, CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT GUID FROM TBSIG_ENVELOPE WHERE STATUS = @Status AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= 1 ORDER BY GUID";
+        var ids = new List<int>();
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@Status", (int)EnvelopeStatus.EnvelopeCompletelySigned);
+        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
+        while (await reader.ReadAsync(cancellationToken))
+        {
+            ids.Add(reader.GetInt32(0));
+        }
+
+        return ids;
+    }
+
+    private async Task<(int EnvelopeId, string? EnvelopeUuid, string? Title, byte[] DocumentBytes, List<string> AnnotationData, string ParentFolderUid)?> GetEnvelopeDataAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
+    {
+        const string sql = @"SELECT T.GUID, T.ENVELOPE_UUID, T.TITLE, T2.FILEPATH, T2.BYTE_DATA FROM [dbo].[TBSIG_ENVELOPE] T
+                JOIN TBSIG_ENVELOPE_DOCUMENT T2 ON T.GUID = T2.ENVELOPE_ID
+                WHERE T.GUID = @EnvelopeId";
+
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await using var reader = await command.ExecuteReaderAsync(CommandBehavior.SingleRow, cancellationToken);
+        if (!await reader.ReadAsync(cancellationToken))
+        {
+            return null;
+        }
+
+        var envelopeUuid = reader.IsDBNull(1) ? string.Empty : reader.GetString(1);
+        var title = reader.IsDBNull(2) ? string.Empty : reader.GetString(2);
+        var filePath = reader.IsDBNull(3) ? string.Empty : reader.GetString(3);
+        var bytes = reader.IsDBNull(4) ? Array.Empty<byte>() : (byte[])reader[4];
+        await reader.CloseAsync();
+
+        if (bytes.Length == 0 && !string.IsNullOrWhiteSpace(filePath) && File.Exists(filePath))
+        {
+            bytes = await File.ReadAllBytesAsync(filePath, cancellationToken);
+        }
+
+        var annotations = await GetAnnotationDataAsync(connection, envelopeId, cancellationToken);
+
+        var parentFolderUid = !string.IsNullOrWhiteSpace(filePath)
+            ? Path.GetFileName(Path.GetDirectoryName(filePath) ?? string.Empty)
+            : envelopeUuid;
+
+        return (envelopeId, envelopeUuid, title, bytes, annotations, parentFolderUid ?? envelopeUuid ?? envelopeId.ToString());
+    }
+
+    private async Task<List<string>> GetAnnotationDataAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
+    {
+        const string sql = "SELECT VALUE FROM TBSIG_DOCUMENT_STATUS WHERE ENVELOPE_ID = @EnvelopeId";
+        var result = new List<string>();
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await using var reader = await command.ExecuteReaderAsync(cancellationToken);
+        while (await reader.ReadAsync(cancellationToken))
+        {
+            if (!reader.IsDBNull(0))
+            {
+                result.Add(reader.GetString(0));
+            }
+        }
+
+        return result;
+    }
+
+    private static async Task UpdateDocumentResultAsync(SqlConnection connection, int envelopeId, byte[] bytes, CancellationToken cancellationToken)
+    {
+        const string sql = "UPDATE TBSIG_ENVELOPE SET DOC_RESULT = @ImageData WHERE GUID = @EnvelopeId";
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@ImageData", bytes);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await command.ExecuteNonQueryAsync(cancellationToken);
+    }
+
+    private static async Task ArchiveEnvelopeAsync(SqlConnection connection, int envelopeId, CancellationToken cancellationToken)
+    {
+        const string sql = "UPDATE TBSIG_ENVELOPE SET STATUS = @Status, CHANGED_WHEN = GETDATE() WHERE GUID = @EnvelopeId";
+        await using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@Status", (int)EnvelopeStatus.EnvelopeArchived);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        await command.ExecuteNonQueryAsync(cancellationToken);
+    }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurner.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurner.cs
@@ -0,0 +1,277 @@
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using iText.IO.Image;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Canvas;
+using iText.Layout;
+using iText.Layout.Element;
+using iText.Layout.Font;
+using iText.Layout.Properties;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Newtonsoft.Json;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+using LayoutImage = iText.Layout.Element.Image;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class PDFBurner
+{
+    private static readonly FontProvider FontProvider = CreateFontProvider();
+    private readonly ILogger<PDFBurner> _logger;
+    private readonly PDFBurnerParams _pdfBurnerParams;
+
+    public PDFBurner() : this(NullLogger<PDFBurner>.Instance, new PDFBurnerParams())
+    {
+    }
+
+    public PDFBurner(ILogger<PDFBurner> logger, PDFBurnerParams? pdfBurnerParams = null)
+    {
+        _logger = logger;
+        _pdfBurnerParams = pdfBurnerParams ?? new PDFBurnerParams();
+    }
+
+    public byte[] BurnAnnotsToPDF(byte[] sourceBuffer, IList<string> instantJsonList, int envelopeId)
+    {
+        if (sourceBuffer is null || sourceBuffer.Length == 0)
+        {
+            throw new BurnAnnotationException("Source document is empty");
+        }
+
+        try
+        {
+            using var inputStream = new MemoryStream(sourceBuffer);
+            using var outputStream = new MemoryStream();
+            using var reader = new PdfReader(inputStream);
+            using var writer = new PdfWriter(outputStream);
+            using var pdf = new PdfDocument(reader, writer);
+
+            foreach (var json in instantJsonList ?? Enumerable.Empty<string>())
+            {
+                if (string.IsNullOrWhiteSpace(json))
+                {
+                    continue;
+                }
+
+                var annotationData = JsonConvert.DeserializeObject<AnnotationData>(json);
+                if (annotationData?.annotations is null)
+                {
+                    continue;
+                }
+
+                annotationData.annotations.Reverse();
+
+                foreach (var annotation in annotationData.annotations)
+                {
+                    try
+                    {
+                        switch (annotation.type)
+                        {
+                            case AnnotationType.Image:
+                                AddImageAnnotation(pdf, annotation, annotationData.attachments);
+                                break;
+                            case AnnotationType.Ink:
+                                AddInkAnnotation(pdf, annotation);
+                                break;
+                            case AnnotationType.Widget:
+                                var formFieldValue = annotationData.formFieldValues?.FirstOrDefault(fv => fv.name == annotation.id);
+                                if (formFieldValue is not null && !_pdfBurnerParams.IgnoredLabels.Contains(formFieldValue.value))
+                                {
+                                    AddFormFieldValue(pdf, annotation, formFieldValue.value);
+                                }
+                                break;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex, "Error applying annotation {AnnotationId} on envelope {EnvelopeId}", annotation.id, envelopeId);
+                        throw new BurnAnnotationException("Adding annotation failed", ex);
+                    }
+                }
+            }
+
+            pdf.Close();
+            return outputStream.ToArray();
+        }
+        catch (BurnAnnotationException)
+        {
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to burn annotations for envelope {EnvelopeId}", envelopeId);
+            throw new BurnAnnotationException("Annotations could not be burned", ex);
+        }
+    }
+
+    private void AddImageAnnotation(PdfDocument pdf, Annotation annotation, Dictionary<string, Attachment>? attachments)
+    {
+        if (attachments is null || string.IsNullOrWhiteSpace(annotation.imageAttachmentId) || !attachments.TryGetValue(annotation.imageAttachmentId, out var attachment))
+        {
+            return;
+        }
+
+        var page = pdf.GetPage(annotation.pageIndex + 1);
+        var bounds = annotation.bbox.Select(ToInches).ToList();
+        var x = (float)bounds[0];
+        var y = (float)bounds[1];
+        var width = (float)bounds[2];
+        var height = (float)bounds[3];
+
+        var imageBytes = Convert.FromBase64String(attachment.binary);
+        var imageData = ImageDataFactory.Create(imageBytes);
+        var image = new LayoutImage(imageData)
+            .ScaleAbsolute(width, height)
+            .SetFixedPosition(annotation.pageIndex + 1, x, y);
+
+        using var canvas = new Canvas(new PdfCanvas(page), page.GetPageSize());
+        canvas.Add(image);
+    }
+
+    private void AddInkAnnotation(PdfDocument pdf, Annotation annotation)
+    {
+        if (annotation.lines?.points is null)
+        {
+            return;
+        }
+
+        var page = pdf.GetPage(annotation.pageIndex + 1);
+        var canvas = new PdfCanvas(page);
+        var color = ParseColor(annotation.strokeColor);
+        canvas.SetStrokeColor(color);
+        canvas.SetLineWidth(1);
+
+        foreach (var segment in annotation.lines.points)
+        {
+            var first = true;
+            foreach (var point in segment)
+            {
+                var (px, py) = (ToInches(point[0]), ToInches(point[1]));
+                if (first)
+                {
+                    canvas.MoveTo(px, py);
+                    first = false;
+                }
+                else
+                {
+                    canvas.LineTo(px, py);
+                }
+            }
+            canvas.Stroke();
+        }
+    }
+
+    private static FontProvider CreateFontProvider()
+    {
+        var provider = new FontProvider();
+        provider.AddStandardPdfFonts();
+        provider.AddSystemFonts();
+        return provider;
+    }
+
+    private void AddFormFieldValue(PdfDocument pdf, Annotation annotation, string value)
+    {
+        var bounds = annotation.bbox.Select(ToInches).ToList();
+        var x = (float)bounds[0];
+        var y = (float)bounds[1];
+        var width = (float)bounds[2];
+        var height = (float)bounds[3];
+
+        var page = pdf.GetPage(annotation.pageIndex + 1);
+        var canvas = new Canvas(new PdfCanvas(page), page.GetPageSize());
+        canvas.SetProperty(Property.FONT_PROVIDER, FontProvider);
+        canvas.SetProperty(Property.FONT, FontProvider.GetFontSet());
+
+        var paragraph = new Paragraph(value)
+            .SetFontSize(_pdfBurnerParams.FontSize)
+            .SetFontColor(ColorConstants.BLACK)
+            .SetFontFamily(_pdfBurnerParams.FontName);
+
+        if (_pdfBurnerParams.FontStyle.HasFlag(FontStyle.Italic))
+        {
+            paragraph.SetItalic();
+        }
+
+        if (_pdfBurnerParams.FontStyle.HasFlag(FontStyle.Bold))
+        {
+            paragraph.SetBold();
+        }
+
+        canvas.ShowTextAligned(
+            paragraph,
+            x + (float)_pdfBurnerParams.TopMargin,
+            y + (float)_pdfBurnerParams.YOffset,
+            annotation.pageIndex + 1,
+            iText.Layout.Properties.TextAlignment.LEFT,
+            iText.Layout.Properties.VerticalAlignment.TOP,
+            0);
+    }
+
+    private static DeviceRgb ParseColor(string? color)
+    {
+        if (string.IsNullOrWhiteSpace(color))
+        {
+            return new DeviceRgb(0, 0, 0);
+        }
+
+        try
+        {
+            var drawingColor = ColorTranslator.FromHtml(color);
+            return new DeviceRgb(drawingColor.R, drawingColor.G, drawingColor.B);
+        }
+        catch
+        {
+            return new DeviceRgb(0, 0, 0);
+        }
+    }
+
+    private static double ToInches(double value) => value / 72d;
+    private static double ToInches(float value) => value / 72d;
+
+    #region Model
+    private static class AnnotationType
+    {
+        public const string Image = "pspdfkit/image";
+        public const string Ink = "pspdfkit/ink";
+        public const string Widget = "pspdfkit/widget";
+    }
+
+    private sealed class AnnotationData
+    {
+        public List<Annotation>? annotations { get; set; }
+        public Dictionary<string, Attachment>? attachments { get; set; }
+        public List<FormFieldValue>? formFieldValues { get; set; }
+    }
+
+    private sealed class Annotation
+    {
+        public string id { get; set; } = string.Empty;
+        public List<double> bbox { get; set; } = new();
+        public string type { get; set; } = string.Empty;
+        public string imageAttachmentId { get; set; } = string.Empty;
+        public Lines? lines { get; set; }
+        public int pageIndex { get; set; }
+        public string strokeColor { get; set; } = string.Empty;
+        public string egName { get; set; } = string.Empty;
+    }
+
+    private sealed class Lines
+    {
+        public List<List<List<float>>> points { get; set; } = new();
+    }
+
+    private sealed class Attachment
+    {
+        public string binary { get; set; } = string.Empty;
+        public string contentType { get; set; } = string.Empty;
+    }
+
+    private sealed class FormFieldValue
+    {
+        public string name { get; set; } = string.Empty;
+        public string value { get; set; } = string.Empty;
+    }
+    #endregion
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurnerParams.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFBurnerParams.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class PDFBurnerParams
+{
+    public List<string> IgnoredLabels { get; } = new() { "Date", "Datum", "ZIP", "PLZ", "Place", "Ort", "Position", "Stellung" };
+
+    public double TopMargin { get; set; } = 0.1;
+
+    public double YOffset { get; set; } = -0.3;
+
+    public string FontName { get; set; } = "Arial";
+
+    public int FontSize { get; set; } = 8;
+
+    public FontStyle FontStyle { get; set; } = FontStyle.Italic;
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFMerger.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/PDFMerger.cs
@@ -0,0 +1,46 @@
+using System.IO;
+using iText.Kernel.Pdf;
+using iText.Kernel.Utils;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class PDFMerger
+{
+    private readonly ILogger<PDFMerger> _logger;
+
+    public PDFMerger() : this(NullLogger<PDFMerger>.Instance)
+    {
+    }
+
+    public PDFMerger(ILogger<PDFMerger> logger)
+    {
+        _logger = logger;
+    }
+
+    public byte[] MergeDocuments(byte[] document, byte[] report)
+    {
+        try
+        {
+            using var finalStream = new MemoryStream();
+            using var documentReader = new PdfReader(new MemoryStream(document));
+            using var reportReader = new PdfReader(new MemoryStream(report));
+            using var writer = new PdfWriter(finalStream);
+            using var targetDoc = new PdfDocument(documentReader, writer);
+            using var reportDoc = new PdfDocument(reportReader);
+
+            var merger = new PdfMerger(targetDoc);
+            merger.Merge(reportDoc, 1, reportDoc.GetNumberOfPages());
+
+            targetDoc.Close();
+            return finalStream.ToArray();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to merge PDF documents");
+            throw new MergeDocumentException("Documents could not be merged", ex);
+        }
+    }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportCreator.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportCreator.cs
@@ -0,0 +1,91 @@
+using System.Data;
+using System.IO;
+using EnvelopeGenerator.Domain.Entities;
+using iText.Kernel.Pdf;
+using iText.Layout.Element;
+using Microsoft.Data.SqlClient;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using static EnvelopeGenerator.Jobs.FinalizeDocument.FinalizeDocumentExceptions;
+using LayoutDocument = iText.Layout.Document;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class ReportCreator
+{
+    private readonly ILogger<ReportCreator> _logger;
+
+    public ReportCreator() : this(NullLogger<ReportCreator>.Instance)
+    {
+    }
+
+    public ReportCreator(ILogger<ReportCreator> logger)
+    {
+        _logger = logger;
+    }
+
+    public byte[] CreateReport(SqlConnection connection, Envelope envelope)
+    {
+        try
+        {
+            var reportItems = LoadReportItems(connection, envelope.Id);
+            using var stream = new MemoryStream();
+            using var writer = new PdfWriter(stream);
+            using var pdf = new PdfDocument(writer);
+            using var document = new LayoutDocument(pdf);
+
+            document.Add(new Paragraph("Envelope Finalization Report").SetFontSize(16));
+            document.Add(new Paragraph($"Envelope Id: {envelope.Id}"));
+            document.Add(new Paragraph($"UUID: {envelope.Uuid}"));
+            document.Add(new Paragraph($"Title: {envelope.Title}"));
+            document.Add(new Paragraph($"Subject: {envelope.Comment}"));
+            document.Add(new Paragraph($"Generated: {DateTime.UtcNow:O}"));
+            document.Add(new Paragraph(" "));
+
+            var table = new Table(4).UseAllAvailableWidth();
+            table.AddHeaderCell("Date");
+            table.AddHeaderCell("Status");
+            table.AddHeaderCell("User");
+            table.AddHeaderCell("EnvelopeId");
+
+            foreach (var item in reportItems.OrderByDescending(r => r.ItemDate))
+            {
+                table.AddCell(item.ItemDate.ToString("u"));
+                table.AddCell(item.ItemStatus.ToString());
+                table.AddCell(item.ItemUserReference);
+                table.AddCell(item.EnvelopeId.ToString());
+            }
+
+            document.Add(table);
+            document.Close();
+            return stream.ToArray();
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Could not create report for envelope {EnvelopeId}", envelope.Id);
+            throw new CreateReportException("Could not prepare report data", ex);
+        }
+    }
+
+    private List<ReportItem> LoadReportItems(SqlConnection connection, int envelopeId)
+    {
+        const string sql = "SELECT ENVELOPE_ID, POS_WHEN, POS_STATUS, POS_WHO FROM VWSIG_ENVELOPE_REPORT WHERE ENVELOPE_ID = @EnvelopeId";
+        var result = new List<ReportItem>();
+
+        using var command = new SqlCommand(sql, connection);
+        command.Parameters.AddWithValue("@EnvelopeId", envelopeId);
+        using var reader = command.ExecuteReader();
+        while (reader.Read())
+        {
+            result.Add(new ReportItem
+            {
+                EnvelopeId = reader.GetInt32(0),
+                ItemDate = reader.IsDBNull(1) ? DateTime.MinValue : reader.GetDateTime(1),
+                ItemStatus = reader.IsDBNull(2) ? default : (EnvelopeGenerator.Domain.Constants.EnvelopeStatus)reader.GetInt32(2),
+                ItemUserReference = reader.IsDBNull(3) ? string.Empty : reader.GetString(3)
+            });
+        }
+
+        return result;
+    }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportItem.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportItem.cs
@@ -0,0 +1,19 @@
+using EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class ReportItem
+{
+    public Envelope? Envelope { get; set; }
+    public int EnvelopeId { get; set; }
+    public string EnvelopeTitle { get; set; } = string.Empty;
+    public string EnvelopeSubject { get; set; } = string.Empty;
+
+    public EnvelopeStatus ItemStatus { get; set; }
+
+    public string ItemStatusTranslated => ItemStatus.ToString();
+
+    public string ItemUserReference { get; set; } = string.Empty;
+    public DateTime ItemDate { get; set; }
+}
--- a/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportSource.cs
+++ b/EnvelopeGenerator.Jobs/Jobs/FinalizeDocument/ReportSource.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace EnvelopeGenerator.Jobs.FinalizeDocument;
+
+public class ReportSource
+{
+    public List<ReportItem> Items { get; set; } = new();
+}
--- a/EnvelopeGenerator.PdfEditor/Pdf.cs
+++ b/EnvelopeGenerator.PdfEditor/Pdf.cs
@@ -105,13 +105,17 @@ namespace EnvelopeGenerator.PdfEditor
        public Pdf<TInputStream, TOutputStream> Background<TSignature>(IEnumerable<TSignature> signatures, double widthPx = 1.9500000000000002, double heightPx = 2.52)
            where TSignature : ISignature
        {
+            // once per page
+            Page(page =>
+            {
+                var canvas = new PdfCanvas(page);
+                canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
+            });
+
            foreach (var signature in signatures)
                Page(signature.Page, page =>
                {
                    var canvas = new PdfCanvas(page);
-                    canvas.SaveState();
-                    canvas.ConcatMatrix(1, 0, 0, -1, 0, page.GetPageSize().GetHeight());
-
                    double inchFactor = 72;
                    double magin = .2;
                    double x = (signature.X - .7 - magin) * inchFactor;
@@ -130,8 +134,6 @@ namespace EnvelopeGenerator.PdfEditor
                    canvas.SetFillColor(new DeviceRgb(204, 202, 198))
                        .Rectangle(x, y + height - bottomLineLength, width, bottomLineLength)
                        .Fill();
-
-                    canvas.RestoreState();
                });

            return this;
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/AccessCodeForm.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/AccessCodeForm.razor
@@ -0,0 +1,5 @@
+<h3>AccessCodeForm</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/PdfViewer.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/PdfViewer.razor
@@ -0,0 +1,5 @@
+<h3>PdfViewer</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/SignaturePanel.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/SignaturePanel.razor
@@ -0,0 +1,5 @@
+<h3>SignaturePanel</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/TwoFactorForm.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Envelope/TwoFactorForm.razor
@@ -0,0 +1,5 @@
+<h3>TwoFactorForm</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Layout/NavHeader.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Layout/NavHeader.razor
@@ -0,0 +1,5 @@
+<h3>NavHeader</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/AlertMessage.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/AlertMessage.razor
@@ -0,0 +1,5 @@
+<h3>AlertMessage</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/ErrorDisplay.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/ErrorDisplay.razor
@@ -0,0 +1,5 @@
+<h3>ErrorDisplay</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/LanguageSelector.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/LanguageSelector.razor
@@ -0,0 +1,5 @@
+<h3>LanguageSelector</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/LoadingIndicator.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Components/Shared/LoadingIndicator.razor
@@ -0,0 +1,5 @@
+<h3>LoadingIndicator</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/EnvelopeGenerator.ReceiverUI.Client.csproj
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/EnvelopeGenerator.ReceiverUI.Client.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+    <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.22" />
+  </ItemGroup>
+
+</Project>
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/AccessCodeModel.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/AccessCodeModel.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Models
+{
+    public class AccessCodeModel
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/AuthState.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/AuthState.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Models
+{
+    public class AuthState
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/EnvelopeViewModel.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Models/EnvelopeViewModel.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Models
+{
+    public class EnvelopeViewModel
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeExpired.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeExpired.razor
@@ -0,0 +1,5 @@
+<h3>EnvelopeExpired</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeLocked.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeLocked.razor
@@ -0,0 +1,5 @@
+<h3>EnvelopeLocked</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopePage.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopePage.razor
@@ -0,0 +1,5 @@
+<h3>EnvelopePage</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeRejected.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeRejected.razor
@@ -0,0 +1,5 @@
+<h3>EnvelopeRejected</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeSigned.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Envelope/EnvelopeSigned.razor
@@ -0,0 +1,5 @@
+<h3>EnvelopeSigned</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Home.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/Home.razor
@@ -0,0 +1,5 @@
+<h3>Home</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/NotFound.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Pages/NotFound.razor
@@ -0,0 +1,5 @@
+<h3>NotFound</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Program.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Program.cs
@@ -0,0 +1,5 @@
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+
+var builder = WebAssemblyHostBuilder.CreateDefault(args);
+
+await builder.Build().RunAsync();
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/AuthService.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/AuthService.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services
+{
+    public class AuthService
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/Base/ApiResponse.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/Base/ApiResponse.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services.Base
+{
+    public class ApiResponse
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/Base/ApiServiceBase.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/Base/ApiServiceBase.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services.Base
+{
+    public class ApiServiceBase
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/EnvelopeService.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/EnvelopeService.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services
+{
+    public class EnvelopeService
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/HistoryService.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/HistoryService.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services
+{
+    public class HistoryService
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IAuthService.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IAuthService.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services
+{
+    public interface IAuthService
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IEnvelopeService.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IEnvelopeService.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services
+{
+    public interface IEnvelopeService
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IHistoryService.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/Services/IHistoryService.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.Services
+{
+    public interface IHistoryService
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/State/AuthState.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/State/AuthState.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.State
+{
+    public class AuthState
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/State/EnvelopeState.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/State/EnvelopeState.cs
@@ -0,0 +1,6 @@
+namespace EnvelopeGenerator.ReceiverUI.Client.State
+{
+    public class EnvelopeState
+    {
+    }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/_Imports.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/_Imports.razor
@@ -0,0 +1,9 @@
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using EnvelopeGenerator.ReceiverUI.Client
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/wwwroot/css/app.css
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.Client/wwwroot/css/app.css
@@ -0,0 +1,2 @@
+body {
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/App.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/App.razor
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/" />
+    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
+    <link rel="stylesheet" href="app.css" />
+    <link rel="stylesheet" href="EnvelopeGenerator.ReceiverUI.styles.css" />
+    <link rel="icon" type="image/png" href="favicon.png" />
+    <HeadOutlet />
+</head>
+
+<body>
+    <Routes />
+    <script src="_framework/blazor.web.js"></script>
+</body>
+
+</html>
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/AuthLayout.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/AuthLayout.razor
@@ -0,0 +1,5 @@
+<h3>AuthLayout</h3>
+
+@code {
+
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/MainLayout.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/MainLayout.razor
@@ -0,0 +1,23 @@
+@inherits LayoutComponentBase
+
+<div class="page">
+    <div class="sidebar">
+        <NavMenu />
+    </div>
+
+    <main>
+        <div class="top-row px-4">
+            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
+        </div>
+
+        <article class="content px-4">
+            @Body
+        </article>
+    </main>
+</div>
+
+<div id="blazor-error-ui">
+    An unhandled error has occurred.
+    <a href="" class="reload">Reload</a>
+    <a class="dismiss">🗙</a>
+</div>
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/MainLayout.razor.css
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Layout/MainLayout.razor.css
@@ -0,0 +1,96 @@
+.page {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+}
+
+main {
+    flex: 1;
+}
+
+.sidebar {
+    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+}
+
+.top-row {
+    background-color: #f7f7f7;
+    border-bottom: 1px solid #d6d5d5;
+    justify-content: flex-end;
+    height: 3.5rem;
+    display: flex;
+    align-items: center;
+}
+
+    .top-row ::deep a, .top-row ::deep .btn-link {
+        white-space: nowrap;
+        margin-left: 1.5rem;
+        text-decoration: none;
+    }
+
+    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
+        text-decoration: underline;
+    }
+
+    .top-row ::deep a:first-child {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+
+@media (max-width: 640.98px) {
+    .top-row {
+        justify-content: space-between;
+    }
+
+    .top-row ::deep a, .top-row ::deep .btn-link {
+        margin-left: 0;
+    }
+}
+
+@media (min-width: 641px) {
+    .page {
+        flex-direction: row;
+    }
+
+    .sidebar {
+        width: 250px;
+        height: 100vh;
+        position: sticky;
+        top: 0;
+    }
+
+    .top-row {
+        position: sticky;
+        top: 0;
+        z-index: 1;
+    }
+
+    .top-row.auth ::deep a:first-child {
+        flex: 1;
+        text-align: right;
+        width: 0;
+    }
+
+    .top-row, article {
+        padding-left: 2rem !important;
+        padding-right: 1.5rem !important;
+    }
+}
+
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+    #blazor-error-ui .dismiss {
+        cursor: pointer;
+        position: absolute;
+        right: 0.75rem;
+        top: 0.5rem;
+    }
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Pages/Error.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Pages/Error.razor
@@ -0,0 +1,36 @@
+@page "/Error"
+@using System.Diagnostics
+
+<PageTitle>Error</PageTitle>
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>
+
+@if (ShowRequestId)
+{
+    <p>
+        <strong>Request ID:</strong> <code>@RequestId</code>
+    </p>
+}
+
+<h3>Development Mode</h3>
+<p>
+    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
+</p>
+<p>
+    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
+    It can result in displaying sensitive information from exceptions to end users.
+    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
+    and restarting the app.
+</p>
+
+@code{
+    [CascadingParameter]
+    private HttpContext? HttpContext { get; set; }
+
+    private string? RequestId { get; set; }
+    private bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+    protected override void OnInitialized() =>
+        RequestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier;
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Pages/Home.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Pages/Home.razor
@@ -0,0 +1,7 @@
+@page "/"
+
+<PageTitle>Home</PageTitle>
+
+<h1>Hello, world!</h1>
+
+Welcome to your new app.
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Routes.razor
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Components/Routes.razor
@@ -0,0 +1,6 @@
+<Router AppAssembly="typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Client._Imports).Assembly }">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)" />
+        <FocusOnNavigate RouteData="routeData" Selector="h1" />
+    </Found>
+</Router>
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.csproj
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\EnvelopeGenerator.ReceiverUI.Client\EnvelopeGenerator.ReceiverUI.Client.csproj" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.22" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\css\" />
+  </ItemGroup>
+
+</Project>
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Program.cs
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Program.cs
@@ -0,0 +1,35 @@
+using EnvelopeGenerator.ReceiverUI.Client.Pages;
+using EnvelopeGenerator.ReceiverUI.Components;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+builder.Services.AddRazorComponents()
+    .AddInteractiveServerComponents()
+    .AddInteractiveWebAssemblyComponents();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseWebAssemblyDebugging();
+}
+else
+{
+    app.UseExceptionHandler("/Error", createScopeForErrors: true);
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
+}
+
+app.UseHttpsRedirection();
+
+app.UseStaticFiles();
+app.UseAntiforgery();
+
+app.MapRazorComponents<App>()
+    .AddInteractiveServerRenderMode()
+    .AddInteractiveWebAssemblyRenderMode()
+    .AddAdditionalAssemblies(typeof(EnvelopeGenerator.ReceiverUI.Client._Imports).Assembly);
+
+app.Run();
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Properties/launchSettings.json
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/Properties/launchSettings.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+    "iisSettings": {
+      "windowsAuthentication": false,
+      "anonymousAuthentication": true,
+      "iisExpress": {
+        "applicationUrl": "http://localhost:3101",
+        "sslPort": 44303
+      }
+    },
+    "profiles": {
+      "http": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "http://localhost:5109",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "https": {
+        "commandName": "Project",
+        "dotnetRunMessages": true,
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "applicationUrl": "https://localhost:7206;http://localhost:5109",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      },
+      "IIS Express": {
+        "commandName": "IISExpress",
+        "launchBrowser": true,
+        "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+        "environmentVariables": {
+          "ASPNETCORE_ENVIRONMENT": "Development"
+        }
+      }
+    }
+  }
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/appsettings.Development.json
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/appsettings.json
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/wwwroot/favicon.png
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/wwwroot/favicon.png
--- a/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/wwwroot/js/pdfviewer-interop.js
+++ b/EnvelopeGenerator.ReceiverUI/EnvelopeGenerator.ReceiverUI/wwwroot/js/pdfviewer-interop.js
@@ -0,0 +1 @@
+
--- a/EnvelopeGenerator.Service/App.config
+++ b/EnvelopeGenerator.Service/App.config
@@ -15,7 +15,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -23,15 +23,15 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -39,7 +39,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -51,7 +51,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.6" newVersion="8.0.0.6" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -59,7 +59,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -67,7 +67,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Extensions.Caching.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -135,7 +135,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Formats.Asn1" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
--- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
+++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -17,8 +17,7 @@
    <TargetFrameworkProfile />
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>P:\Install .Net\0 DD - Smart UP\signFLOW\Finalization\%24%28Version%29\</PublishUrl>
+    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
    <UpdateEnabled>false</UpdateEnabled>
@@ -28,11 +27,10 @@
    <UpdatePeriodically>false</UpdatePeriodically>
    <UpdateRequired>false</UpdateRequired>
    <MapFileExtensions>true</MapFileExtensions>
-    <AutorunEnabled>true</AutorunEnabled>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -67,18 +65,6 @@
  <PropertyGroup>
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestCertificateThumbprint>905CDA07C40CC715F90A2F2A0C5C0E5BAACE138B</ManifestCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ManifestKeyFile>EnvelopeGenerator.Service_TemporaryKey.pfx</ManifestKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>true</SignManifests>
-  </PropertyGroup>
  <ItemGroup>
    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
      <HintPath>..\packages\BouncyCastle.Cryptography.2.6.2\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
@@ -195,11 +181,11 @@
    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -226,8 +212,8 @@
      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
    </Reference>
    <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
@@ -235,9 +221,6 @@
    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
    </Reference>
-    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
-    </Reference>
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Configuration.Install" />
@@ -251,18 +234,18 @@
      <HintPath>..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll</HintPath>
    </Reference>
    <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Remoting" />
    <Reference Include="System.Runtime.Serialization" />
@@ -275,15 +258,15 @@
    <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
    </Reference>
-    <Reference Include="System.Text.Json, Version=8.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Transactions" />
-    <Reference Include="System.ValueTuple, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
@@ -291,63 +274,6 @@
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="System.Net.Http" />
    <Reference Include="WindowsBase" />
-    <Reference Include="Microsoft.Data.SqlClient, Version=6.0.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Data.SqlClient.6.1.4\lib\net462\Microsoft.Data.SqlClient.dll</HintPath>
-    </Reference>
-    <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Core.Abstraction.Application, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Core.Abstraction.Application.1.6.0\lib\net462\DigitalData.Core.Abstraction.Application.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Abstractions, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Abstractions.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.Relational, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.Relational.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer, Version=3.1.32.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.EntityFrameworkCore.SqlServer.3.1.32\lib\netstandard2.0\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Caching.Memory.8.0.1\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.7.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Configuration.Binder.7.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.7.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.7.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.Common, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.Common.4.3.0\lib\net451\System.Data.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
@@ -411,7 +337,6 @@
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
-    <None Include="EnvelopeGenerator.Service_TemporaryKey.pfx" />
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
@@ -455,8 +380,6 @@
    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets'))" />
  </Target>
  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
-  <Import Project="..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.6.0.2\build\net462\Microsoft.Data.SqlClient.SNI.targets')" />
 </Project>
--- a/EnvelopeGenerator.Service/packages.config
+++ b/EnvelopeGenerator.Service/packages.config
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="10.1.1" targetFramework="net462" />
  <package id="BouncyCastle.Cryptography" version="2.6.2" targetFramework="net462" />
-  <package id="DigitalData.Core.Abstraction.Application" version="1.6.0" targetFramework="net462" />
  <package id="DigitalData.Core.Abstractions" version="4.3.0" targetFramework="net462" />
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net48" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net48" />
@@ -13,26 +11,11 @@
  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net48" />
  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net48" />
-  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net462" />
  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
-  <package id="Microsoft.Data.SqlClient" version="6.1.4" targetFramework="net462" />
-  <package id="Microsoft.Data.SqlClient.SNI" version="6.0.2" targetFramework="net462" />
-  <package id="Microsoft.EntityFrameworkCore" version="3.1.32" targetFramework="net462" />
-  <package id="Microsoft.EntityFrameworkCore.Abstractions" version="3.1.32" targetFramework="net462" />
-  <package id="Microsoft.EntityFrameworkCore.Relational" version="3.1.32" targetFramework="net462" />
-  <package id="Microsoft.EntityFrameworkCore.SqlServer" version="3.1.32" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="8.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Configuration" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="7.0.0" targetFramework="net462" />
  <package id="Microsoft.Extensions.DependencyInjection" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.3" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Options" version="8.0.2" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" targetFramework="net462" />
-  <package id="Microsoft.Extensions.Primitives" version="8.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net48" />
  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net48" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
@@ -41,20 +24,18 @@
  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net48" />
  <package id="Quartz" version="3.15.0" targetFramework="net462" />
  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net48" />
-  <package id="System.Buffers" version="4.6.1" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
  <package id="System.CodeDom" version="8.0.0" targetFramework="net48" />
  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net48" />
-  <package id="System.ComponentModel.Annotations" version="4.7.0" targetFramework="net48" />
  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net462" />
  <package id="System.IO.Packaging" version="8.0.1" targetFramework="net48" />
  <package id="System.Management" version="8.0.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.3" targetFramework="net462" />
-  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net462" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
  <package id="System.Security.Cryptography.Pkcs" version="8.0.1" targetFramework="net48" />
  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
-  <package id="System.Text.Json" version="8.0.6" targetFramework="net48" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.6.1" targetFramework="net462" />
+  <package id="System.Text.Json" version="8.0.5" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" requireReinstallation="true" />
 </packages>
--- a/EnvelopeGenerator.Tests/Application/Fake.cs
+++ b/EnvelopeGenerator.Tests/Application/Fake.cs
@@ -215,7 +215,7 @@ public static class Extensions
        Title = faker.Lorem.Paragraph(faker.Random.Number(1, 2)),
        Message = faker.Lorem.Paragraph(faker.Random.Number(2, 5)),
        TfaEnabled = tfaEnabled,
-        AddedWhen = DateTime.Now,
+        AddedWhen = DateTime.UtcNow,
        CertificationType = (int)CertificationType.AdvancedElectronicSignature,
        UseAccessCode = false,
        ContractType = (int)ContractType.Contract,
@@ -273,9 +273,9 @@ public static class Extensions
        EnvelopeId = envelopeId,
        ReceiverId = receiverId,
        Status = ReceiverStatus.Unsigned,
-        AddedWhen = DateTime.Now,
+        AddedWhen = DateTime.UtcNow,
        AccessCode = faker.Random.Number(1000, 9999).ToString(),
-        ChangedWhen = DateTime.Now,
+        ChangedWhen = DateTime.UtcNow,
        CompanyName = faker.Company.CompanyName(),
        JobTitle = faker.Name.JobTitle(),
        Name = faker.Name.FullName(),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
OlgunR	7271a92d32	Folder structure & files updated	2026-03-17 16:17:52 +01:00
OlgunR	c7275ad966	Deleted demo files	2026-03-17 13:03:34 +01:00
OlgunR	bf8115259a	Added folder structure and files	2026-03-17 12:36:14 +01:00
OlgunR	590ab9bf02	init EnvelopeGenerator.ReceiverUI	2026-03-16 16:16:44 +01:00