diff --git a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
index f8c11be2..653e6c4c 100644
--- a/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
+++ b/EnvelopeGenerator.GeneratorAPI/Controllers/ReceiverController.cs
@@ -2,6 +2,7 @@
 using DigitalData.Core.DTO;
 using EnvelopeGenerator.Application.Contracts.Services;
 using EnvelopeGenerator.Application.DTOs.Receiver;
+using EnvelopeGenerator.Application.Receivers.Queries.Read;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -18,14 +19,14 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
         }
 
         [HttpGet]
-        public async Task<IActionResult> Get([FromQuery] string? emailAddress = null, [FromQuery] string? signature = null)
+        public async Task<IActionResult> Get([FromQuery] ReadReceiverQuery receiver)
         {
-            if (emailAddress is null && signature is null)
+            if (receiver.EmailAddress is null && receiver.Signature is null)
                 return await base.GetAll();
 
             try
             {
-                return await _service.ReadByAsync(emailAddress: emailAddress, signature: signature).ThenAsync(
+                return await _service.ReadByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
                         Success: Ok,
                         Fail: IActionResult (msg, ntc) =>
                         {
@@ -50,15 +51,15 @@ namespace EnvelopeGenerator.GeneratorAPI.Controllers
         }
 
         [HttpDelete]
-        public async Task<IActionResult> Delete([FromQuery] int? id = null, [FromQuery]string? emailAddress = null, [FromQuery] string? signature = null)
+        public async Task<IActionResult> Delete([FromQuery] ReadReceiverQuery receiver)
         {
-            if(id is int id_int)
+            if(receiver.Id is int id_int)
                 return await base.Delete(id_int);
 
             try
             {
-                if (emailAddress is not null || signature is not null)
-                    return await _service.DeleteByAsync(emailAddress: emailAddress, signature: signature).ThenAsync(
+                if (receiver.EmailAddress is not null || receiver.Signature is not null)
+                    return await _service.DeleteByAsync(emailAddress: receiver.EmailAddress, signature: receiver.Signature).ThenAsync(
                         Success: Ok,
                         Fail: IActionResult (msg, ntc) =>
                         {