diff --git a/EnvelopeGenerator.Application/Extensions/QueryExtensions.cs b/EnvelopeGenerator.Application/Extensions/QueryExtensions.cs
index a43cec9b..84f0d473 100644
--- a/EnvelopeGenerator.Application/Extensions/QueryExtensions.cs
+++ b/EnvelopeGenerator.Application/Extensions/QueryExtensions.cs
@@ -1,4 +1,5 @@
 using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Interfaces.Model;
 using EnvelopeGenerator.Application.Model;
 using EnvelopeGenerator.Domain.Interfaces;
 
diff --git a/EnvelopeGenerator.Application/Model/IHasEnvelopeQuery.cs b/EnvelopeGenerator.Application/Interfaces/Model/IHasEnvelopeQuery.cs
similarity index 76%
rename from EnvelopeGenerator.Application/Model/IHasEnvelopeQuery.cs
rename to EnvelopeGenerator.Application/Interfaces/Model/IHasEnvelopeQuery.cs
index 2a65a081..1f2dc5ae 100644
--- a/EnvelopeGenerator.Application/Model/IHasEnvelopeQuery.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Model/IHasEnvelopeQuery.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Application.Model;
+
+namespace EnvelopeGenerator.Application.Interfaces.Model;
 
 /// <summary>
 /// 
diff --git a/EnvelopeGenerator.Application/Model/IHasReceiverQuery.cs b/EnvelopeGenerator.Application/Interfaces/Model/IHasReceiverQuery.cs
similarity index 76%
rename from EnvelopeGenerator.Application/Model/IHasReceiverQuery.cs
rename to EnvelopeGenerator.Application/Interfaces/Model/IHasReceiverQuery.cs
index dd887969..f38f570f 100644
--- a/EnvelopeGenerator.Application/Model/IHasReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Model/IHasReceiverQuery.cs
@@ -1,4 +1,6 @@
-namespace EnvelopeGenerator.Application.Model;
+using EnvelopeGenerator.Application.Model;
+
+namespace EnvelopeGenerator.Application.Interfaces.Model;
 
 /// <summary>
 /// 
diff --git a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
index 51426027..bae08019 100644
--- a/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Model/EnvelopeReceiverQueryBase.cs
@@ -1,4 +1,5 @@
 using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Interfaces.Model;
 using EnvelopeGenerator.Extensions;
 
 namespace EnvelopeGenerator.Application.Model;
diff --git a/EnvelopeGenerator.Application/Model/MappingProfile.cs b/EnvelopeGenerator.Application/Model/MappingProfile.cs
index 29184e5d..f099bb99 100644
--- a/EnvelopeGenerator.Application/Model/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Model/MappingProfile.cs
@@ -15,5 +15,6 @@ public class MappingProfile : Profile
     {
         CreateMap<EnvelopeQueryBase, Envelope>();
         CreateMap<ReceiverQueryBase, Receiver>();
+        CreateMap<EnvelopeReceiverQueryBase, EnvelopeReceiver>();
     }
 }
\ No newline at end of file