diff --git a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
index 8397770a..3c6f7b33 100644
--- a/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Common/Dto/MappingProfile.cs
@@ -40,6 +40,7 @@ public class MappingProfile : Profile
         // DTO to Entity mappings
         CreateMap<ConfigDto, Config>();
         CreateMap<DocReceiverElementDto, DocReceiverElement>();
+        CreateMap<Signature, DocReceiverElement>().MapChangedWhen();
         CreateMap<DocumentStatusDto, DocumentStatus>();
         CreateMap<EmailTemplateDto, EmailTemplate>();
         CreateMap<EnvelopeDto, Envelope>();
diff --git a/EnvelopeGenerator.Application/Common/Dto/Signature.cs b/EnvelopeGenerator.Application/Common/Dto/Signature.cs
new file mode 100644
index 00000000..2462c628
--- /dev/null
+++ b/EnvelopeGenerator.Application/Common/Dto/Signature.cs
@@ -0,0 +1,65 @@
+namespace EnvelopeGenerator.Application.Common.Dto;
+
+/// <summary>
+/// Represents a captured signature with metadata created by the receiver in the signature popup.
+/// This model holds the signature image (as base64 data URL) along with signer information
+/// used for rendering applied signatures on the PDF canvas.
+/// </summary>
+/// <remarks>
+/// <b>Used in:</b> EnvelopeViewer.razor signature popup workflow
+/// <br/>
+/// <b>Creation:</b> User draws/types/uploads signature and fills required fields
+/// </remarks>
+public sealed record Signature
+{
+    /// <summary>
+    /// TBDD_DOCUMENT_RECEIVER_ELEMENT.ID - identifies the specific signature field on the PDF page.
+    /// </summary>
+    public required int ElementId { get; init; }
+
+    /// <summary>
+    /// Base64-encoded data URL of the signature image.
+    /// <br/>
+    /// <b>Format:</b> <c>data:image/png;base64,iVBORw0KG...</c>
+    /// <br/>
+    /// <b>Source:</b> Canvas.toDataURL() from signature pad (draw/text/image tabs)
+    /// <br/>
+    /// <b>Usage:</b> Set as <c>img.src</c> in applied signature overlay
+    /// </summary>
+    public required string DataUrl { get; init; }
+
+    /// <summary>
+    /// Full name of the signer (first and last name).
+    /// <br/>
+    /// <b>Required:</b> Yes (validated in popup)
+    /// <br/>
+    /// <b>Example:</b> "Max Mustermann"
+    /// </summary>
+    public required string FullName { get; init; }
+
+    private readonly string? _position = null;
+
+    /// <summary>
+    /// Job title or position of the signer.
+    /// <br/>
+    /// <b>Required:</b> No (optional field)
+    /// <br/>
+    /// <b>Example:</b> "Geschäftsführer" or empty string
+    /// </summary>
+    public string? Position
+    {
+        get => _position;
+        init => _position = string.IsNullOrWhiteSpace(value) ? value : null;
+    }
+
+    /// <summary>
+    /// Location/place where the signature was created.
+    /// <br/>
+    /// <b>Required:</b> Yes (validated in popup)
+    /// <br/>
+    /// <b>Display:</b> Shown with current date in German format (dd.MM.yyyy)
+    /// <br/>
+    /// <b>Example:</b> "Berlin" ? rendered as "Berlin, 26.01.2025"
+    /// </summary>
+    public required string Place { get; init; }
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs b/EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs
index 6d1e56fd..1354b7b9 100644
--- a/EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs
+++ b/EnvelopeGenerator.Application/DocReceiverElements/Commands/SigningCommand.cs
@@ -5,70 +5,6 @@ using EnvelopeGenerator.Application.Common.Query;
 
 namespace EnvelopeGenerator.Application.DocReceiverElements.Commands;
 
-/// <summary>
-/// Represents a captured signature with metadata created by the receiver in the signature popup.
-/// This model holds the signature image (as base64 data URL) along with signer information
-/// used for rendering applied signatures on the PDF canvas.
-/// </summary>
-/// <remarks>
-/// <b>Used in:</b> EnvelopeViewer.razor signature popup workflow
-/// <br/>
-/// <b>Creation:</b> User draws/types/uploads signature and fills required fields
-/// </remarks>
-public sealed record SignatureDto
-{
-    /// <summary>
-    /// TBDD_DOCUMENT_RECEIVER_ELEMENT.ID - identifies the specific signature field on the PDF page.
-    /// </summary>
-    public required int ElementId { get; init; }
-
-    /// <summary>
-    /// Base64-encoded data URL of the signature image.
-    /// <br/>
-    /// <b>Format:</b> <c>data:image/png;base64,iVBORw0KG...</c>
-    /// <br/>
-    /// <b>Source:</b> Canvas.toDataURL() from signature pad (draw/text/image tabs)
-    /// <br/>
-    /// <b>Usage:</b> Set as <c>img.src</c> in applied signature overlay
-    /// </summary>
-    public required string DataUrl { get; init; }
-
-    /// <summary>
-    /// Full name of the signer (first and last name).
-    /// <br/>
-    /// <b>Required:</b> Yes (validated in popup)
-    /// <br/>
-    /// <b>Example:</b> "Max Mustermann"
-    /// </summary>
-    public required string FullName { get; init; }
-
-    private readonly string? _position = null;
-
-    /// <summary>
-    /// Job title or position of the signer.
-    /// <br/>
-    /// <b>Required:</b> No (optional field)
-    /// <br/>
-    /// <b>Example:</b> "Geschäftsführer" or empty string
-    /// </summary>
-    public string? Position
-    {
-        get => _position;
-        init => _position = string.IsNullOrWhiteSpace(value) ? value : null;
-    }
-
-    /// <summary>
-    /// Location/place where the signature was created.
-    /// <br/>
-    /// <b>Required:</b> Yes (validated in popup)
-    /// <br/>
-    /// <b>Display:</b> Shown with current date in German format (dd.MM.yyyy)
-    /// <br/>
-    /// <b>Example:</b> "Berlin" ? rendered as "Berlin, 26.01.2025"
-    /// </summary>
-    public required string Place { get; init; }
-}
-
 /// <summary>
 /// Command to sign a document by a receiver.
 /// </summary>
@@ -99,7 +35,7 @@ public record SigningCommand : EnvelopeReceiverQueryBase, IRequest
     /// <summary>
     /// 
     /// </summary>
-    public IEnumerable<SignatureDto>? Signatures { get; init; }
+    public IEnumerable<Signature>? Signatures { get; init; }
 }
 
 /// <summary>
diff --git a/EnvelopeGenerator.Application/DocReceiverElements/MappingProfile.cs b/EnvelopeGenerator.Application/DocReceiverElements/MappingProfile.cs
deleted file mode 100644
index 84f5c83b..00000000
--- a/EnvelopeGenerator.Application/DocReceiverElements/MappingProfile.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using AutoMapper;
-using EnvelopeGenerator.Application.DocReceiverElements.Commands;
-using EnvelopeGenerator.Domain.Entities;
-
-namespace EnvelopeGenerator.Application.DocReceiverElements;
-
-/// <summary>
-///
-/// </summary>
-public class MappingProfile : Profile
-{
-    /// <summary>
-    ///
-    /// </summary>
-    public MappingProfile()
-    {
-        CreateMap<SignatureDto, DocReceiverElement>();
-    }
-}
\ No newline at end of file