diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
index d90fbf05..97420bff 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
@@ -1,47 +1,13 @@
-using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Model;
 using EnvelopeGenerator.Domain;
-using EnvelopeGenerator.Extensions;
 
 namespace EnvelopeGenerator.Application.DocStatus.Commands;
 
 /// <summary>
 /// 
 /// </summary>
-public record ModifyDocStatusCommandBase
+public record ModifyDocStatusCommandBase : EnvelopeReceiverQuery
 {
-    /// <summary>
-    /// 
-    /// </summary>
-    public string? Key
-    {
-        get => Envelope?.Uuid is string uuid && Receiver?.Signature is string signature
-                ? (uuid, signature).EncodeEnvelopeReceiverId()
-                : null;
-        init
-        {
-            if (value is null)
-                return;
-
-            (string? EnvelopeUuid, string? ReceiverSignature) = value.DecodeEnvelopeReceiverId();
-            if (string.IsNullOrEmpty(EnvelopeUuid) || string.IsNullOrEmpty(ReceiverSignature))
-            {
-                throw new BadRequestException("Der EnvelopeReceiverKey muss ein gültiger Base64-kodierter String sein, der die EnvelopeUuid und die ReceiverSignature enthält.");
-            }
-            Envelope.Uuid = EnvelopeUuid;
-            Receiver.Signature = ReceiverSignature;
-        }
-    }
-
-    /// <summary>
-    /// Der Umschlag, der mit dem Empfänger verknüpft ist.
-    /// </summary>
-    public EnvelopeQuery Envelope { get; set; } = new();
-
-    /// <summary>
-    /// Der Empfänger, der mit dem Umschlag verknüpft ist.
-    /// </summary>
-    public ReceiverQuery Receiver { get; set; } = new();
-
     /// <summary>
     /// Gets the current status code.
     /// </summary>