diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
index 549d3f92..6e71bbc3 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
@@ -1,5 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Model;
 using EnvelopeGenerator.Domain;
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Extensions;
@@ -11,58 +12,7 @@ namespace EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 /// <summary>
 /// 
 /// </summary>
-public record ReceiverAlreadySignedQuery : IRequest<bool>
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Key
-    {
-        get => (Envelope.Uuid, Receiver.Signature).EncodeEnvelopeReceiverId();
-        init
-        {
-            (string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
-            if (string.IsNullOrEmpty(EnvelopeUuid) || string.IsNullOrEmpty(ReceiverSignature))
-            {
-                throw new BadRequestException("Der EnvelopeReceiverKey muss ein gültiger Base64-kodierter String sein, der die EnvelopeUuid und die ReceiverSignature enthält.");
-            }
-        }
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public EnvelopeQuery Envelope { get; set; } = new EnvelopeQuery();
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public ReceiverQuery Receiver { get; set; } = new ReceiverQuery();
-}
-
-#region Queries
-/// <summary>
-/// 
-/// </summary>
-public record EnvelopeQuery()
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Uuid { get; set; } = null!;
-};
-
-/// <summary>
-/// 
-/// </summary>
-public record ReceiverQuery()
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    public string Signature { get; set; } = null!;
-};
-#endregion
+public record ReceiverAlreadySignedQuery : EnvelopeReceiverQueryBase, IRequest<bool>;
 
 /// <summary>
 ///