diff --git a/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs b/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
index 55b32ec9..98f4a7b0 100644
--- a/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Repositories/IEnvelopeReceiverRepository.cs
@@ -1,5 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using EnvelopeGenerator.Application.Envelopes.Queries;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Repositories;
@@ -84,7 +85,7 @@ public interface IEnvelopeReceiverRepository : ICRUDRepository<EnvelopeReceiver,
     /// <param name="max_status"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, params EnvelopeStatusQuery[] ignore_statuses);
+    Task<IEnumerable<EnvelopeReceiver>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, params EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs
index 1868af7f..7504a77d 100644
--- a/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Interfaces/Services/IEnvelopeReceiverService.cs
@@ -7,6 +7,7 @@ using EnvelopeGenerator.Application.Envelopes;
 using EnvelopeGenerator.Application.Envelopes.Queries;
 using EnvelopeGenerator.Application.Receivers.Queries;
 using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Interfaces.Services;
@@ -122,7 +123,7 @@ public interface IEnvelopeReceiverService : IBasicCRUDService<EnvelopeReceiverDt
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatusQuery[] ignore_statuses);
+    Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses);
 
     /// <summary>
     /// 
diff --git a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
index 6bfea539..92ab5cc1 100644
--- a/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
+++ b/EnvelopeGenerator.Application/Services/EnvelopeReceiverService.cs
@@ -237,7 +237,7 @@ public class EnvelopeReceiverService : BasicCRUDService<IEnvelopeReceiverReposit
     /// <param name="receiverQuery"></param>
     /// <param name="ignore_statuses"></param>
     /// <returns></returns>
-    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatusQuery? min_status = null, EnvelopeStatusQuery? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatusQuery[] ignore_statuses)
+    public async Task<DataResult<IEnumerable<EnvelopeReceiverDto>>> ReadByUsernameAsync(string username, EnvelopeStatus? min_status = null, EnvelopeStatus? max_status = null, ReadEnvelopeQuery? envelopeQuery = null, ReadReceiverQuery? receiverQuery = null, params EnvelopeStatus[] ignore_statuses)
     {
         var er_list = await _repository.ReadByUsernameAsync(username: username, min_status: min_status, max_status: max_status, ignore_statuses: ignore_statuses);
         
diff --git a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb
index b337402f..411162d5 100644
--- a/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb
+++ b/EnvelopeGenerator.CommonServices/Jobs/FinalizeDocument/ReportItem.vb
@@ -1,4 +1,4 @@
-Imports EnvelopeGenerator.Domain
+Imports EnvelopeGenerator.Domain.Constants
 Imports EnvelopeGenerator.Domain.Entities
 
 Public Class ReportItem
diff --git a/EnvelopeGenerator.CommonServices/Models/EmailData.vb b/EnvelopeGenerator.CommonServices/Models/EmailData.vb
index d3ac11f0..a902c1cf 100644
--- a/EnvelopeGenerator.CommonServices/Models/EmailData.vb
+++ b/EnvelopeGenerator.CommonServices/Models/EmailData.vb
@@ -1,5 +1,5 @@
-Imports EnvelopeGenerator.CommonServices.EnvelopeGenerator.Domain.Entities
-Imports EnvelopeGenerator.Domain
+Imports EnvelopeGenerator.Domain
+Imports EnvelopeGenerator.Domain.Constants
 Imports EnvelopeGenerator.Domain.Entities
 Public Class EmailData
     Public Property EmailAdress As String = ""
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
index ee8c9207..7c966f3f 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EmailTemplateRepository.cs
@@ -3,7 +3,7 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
-using static EnvelopeGenerator.Domain.Constants;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
index 25763c41..6b8d8751 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeHistoryRepository.cs
@@ -2,7 +2,7 @@
 using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
-using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs
index 2a1282ae..134b3c10 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvelopeRepository.cs
@@ -3,6 +3,7 @@ using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;
 
diff --git a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
index d20489d8..14870415 100644
--- a/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
+++ b/EnvelopeGenerator.Infrastructure/Repositories/EnvlopeReceiverRepository.cs
@@ -4,6 +4,7 @@ using EnvelopeGenerator.Application.Interfaces.Repositories;
 using Microsoft.EntityFrameworkCore;
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Domain;
+using EnvelopeGenerator.Domain.Constants;
 
 namespace EnvelopeGenerator.Infrastructure.Repositories;