diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
index 97088c19..6833e229 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
@@ -36,44 +36,4 @@ public record ModifyDocStatusCommandBase : EnvelopeReceiverQueryBase
             Receiver = Receiver,
             Value = Value
         };
-}
-
-#region Queries
-/// <summary>
-/// Repräsentiert eine Abfrage für Umschläge.
-/// </summary>
-public record EnvelopeQuery
-{
-    /// <summary>
-    /// Die eindeutige Kennung des Umschlags.
-    /// </summary>
-    public int? Id { get; init; }
-
-    /// <summary>
-    /// Die universell eindeutige Kennung des Umschlags.
-    /// </summary>
-    public string? Uuid { get; set; }
-}
-
-/// <summary>
-/// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
-/// um spezifische Informationen über einen Empfänger abzurufen.
-/// </summary>
-public record ReceiverQuery
-{
-    /// <summary>
-    /// ID des Empfängers
-    /// </summary>
-    public int? Id { get; init; }
-
-    /// <summary>
-    /// E-Mail Adresse des Empfängers
-    /// </summary>
-    public string? EmailAddress { get; init; }
-
-    /// <summary>
-    /// Eindeutige Signatur des Empfängers
-    /// </summary>
-    public string? Signature { get; set; }
-}
-#endregion
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs b/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
index 22d22f1f..b04b47e7 100644
--- a/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
@@ -16,7 +16,5 @@ public class MappingProfile : Profile
     {
         CreateMap<CreateDocStatusCommand, DocumentStatus>();
         CreateMap<UpdateDocStatusCommand, DocumentStatus>();
-        CreateMap<EnvelopeQuery, Envelope>();
-        CreateMap<ReceiverQuery, Receiver>();
     }
 }
diff --git a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
index 3995263f..80a28b04 100644
--- a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
@@ -50,12 +50,13 @@ public record EnvelopeReceiverQueryBase<TEnvelopeQuery, TReceiverQuery>
     }
 
     /// <summary>
-    /// 
+    /// Repräsentiert eine Abfrage für Umschläge.
     /// </summary>
     public virtual TEnvelopeQuery Envelope { get; init; } = new();
 
     /// <summary>
-    /// 
+    /// Stellt eine Abfrage dar, um die Details eines Empfängers zu lesen.
+    /// um spezifische Informationen über einen Empfänger abzurufen.
     /// </summary>
     public virtual TReceiverQuery Receiver { get; init; } = new();
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Model/MappingProfile.cs b/EnvelopeGenerator.Application/Model/MappingProfile.cs
new file mode 100644
index 00000000..29184e5d
--- /dev/null
+++ b/EnvelopeGenerator.Application/Model/MappingProfile.cs
@@ -0,0 +1,19 @@
+using AutoMapper;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Model;
+
+/// <summary>
+/// 
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public MappingProfile()
+    {
+        CreateMap<EnvelopeQueryBase, Envelope>();
+        CreateMap<ReceiverQueryBase, Receiver>();
+    }
+}
\ No newline at end of file