diff --git a/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs b/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs
index c86bf6d6..1c840213 100644
--- a/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/MemoryCacheExtensions.cs
@@ -3,10 +3,22 @@ using Microsoft.Extensions.Caching.Memory;
 
 namespace EnvelopeGenerator.Application.Common.Extensions;
 
+/// <summary>
+/// 
+/// </summary>
 public static class MemoryCacheExtensions
 {
     private static readonly Guid BaseId = Guid.NewGuid();
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TEnum"></typeparam>
+    /// <param name="memoryCache"></param>
+    /// <param name="key"></param>
+    /// <param name="ignores"></param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
     public static IDictionary<string, int> GetEnumAsDictionary<TEnum>(this IMemoryCache memoryCache, string key = "", params object[] ignores)
         where TEnum : Enum
         => memoryCache.GetOrCreate(BaseId + typeof(TEnum).FullName + key, _ =>
diff --git a/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs b/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
index 1f3ed9b3..3f88be5a 100644
--- a/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
+++ b/EnvelopeGenerator.Application/Common/Extensions/QueryExtensions.cs
@@ -1,6 +1,7 @@
 using DigitalData.Core.Exceptions;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Query;
+using EnvelopeGenerator.Domain.Entities;
 using EnvelopeGenerator.Domain.Interfaces;
 
 namespace EnvelopeGenerator.Application.Common.Extensions;
@@ -34,6 +35,28 @@ public static class QueryExtensions
         return root;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public static IQueryable<Envelope> Where(this IQueryable<Envelope> root, EnvelopeQueryBase query, bool notnull = true)
+    {
+        if (query.Id is not null)
+            root = root.Where(e => e.Id == query.Id);
+        else if (query.Uuid is not null)
+            root = root.Where(e => e.Uuid == query.Uuid);
+        else if (notnull)
+            throw new BadRequestException(
+                "Either Envelope Id or Envelope Uuid must be provided in the query."
+            );
+
+        return root;
+    }
+
     /// <summary>
     /// 
     /// </summary>
@@ -60,6 +83,30 @@ public static class QueryExtensions
         return root;
     }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="root"></param>
+    /// <param name="query"></param>
+    /// <param name="notnull"></param>
+    /// <returns></returns>
+    /// <exception cref="BadRequestException"></exception>
+    public static IQueryable<Receiver> Where(this IQueryable<Receiver> root, ReceiverQueryBase query, bool notnull = true)
+    {
+        if (query.Id is not null)
+            root = root.Where(e => e.Id == query.Id);
+        else if (query.EmailAddress is not null)
+            root = root.Where(e => e.EmailAddress == query.EmailAddress);
+        else if (query.Signature is not null)
+            root = root.Where(e => e.Signature == query.Signature);
+        else if (notnull)
+            throw new BadRequestException(
+                "Receiver must have at least one identifier (Id, EmailAddress, or Signature)."
+            );
+
+        return root;
+    }
+
     /// <summary>
     /// 
     /// </summary>
diff --git a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
index 377a6f68..73ae86ba 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/SendSignedMailHandler.cs
@@ -1,8 +1,6 @@
 using DigitalData.Core.Abstraction.Application.Repository;
 using DigitalData.EmailProfilerDispatcher.Abstraction.Entities;
 using EnvelopeGenerator.Application.Common.Configurations;
-using EnvelopeGenerator.Application.Common.Notifications;
-using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
 using EnvelopeGenerator.Domain.Entities;
 using Microsoft.Extensions.Options;
 
diff --git a/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs b/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
index 9cd70341..c998891d 100644
--- a/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
+++ b/EnvelopeGenerator.Application/Common/Query/ReceiverQueryBase.cs
@@ -9,12 +9,12 @@ public record ReceiverQueryBase
     /// <summary>
     /// ID des Empfängers
     /// </summary>
-    public virtual int? Id { get; init; }
+    public virtual int? Id { get; set; }
 
     /// <summary>
     /// E-Mail Adresse des Empfängers
     /// </summary>
-    public virtual string? EmailAddress { get; init; }
+    public virtual string? EmailAddress { get; set; }
 
     /// <summary>
     /// Eindeutige Signatur des Empfängers
diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
index a5ad6054..259cb500 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/ModifyDocStatusCommandBase.cs
@@ -8,6 +8,21 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// </summary>
 public record ModifyDocStatusCommandBase : EnvelopeReceiverQueryBase
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? EnvelopeId => Envelope.Id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public int? ReceiverId => Receiver.Id;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public override ReceiverQueryBase Receiver { get => base.Receiver; set => base.Receiver = value; }
+
     /// <summary>
     /// Gets the current status code.
     /// </summary>
diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs b/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
index 70f1cf1d..0f041e8a 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
@@ -23,15 +23,23 @@ public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand,
 
     private readonly IRepository<DocumentStatus> _repo;
 
+    private readonly IRepository<Envelope> _envRepo;
+
+    private readonly IRepository<Receiver> _rcvRepo;
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="mapper"></param>
     /// <param name="repo"></param>
-    public SaveDocStatusCommandHandler(IMapper mapper, IRepository<DocumentStatus> repo)
+    /// <param name="rcvRepo"></param>
+    /// <param name="envRepo"></param>
+    public SaveDocStatusCommandHandler(IMapper mapper, IRepository<DocumentStatus> repo, IRepository<Receiver> rcvRepo, IRepository<Envelope> envRepo)
     {
         _mapper = mapper;
         _repo = repo;
+        _rcvRepo = rcvRepo;
+        _envRepo = envRepo;
     }
 
     /// <summary>
@@ -45,6 +53,12 @@ public class SaveDocStatusCommandHandler : IRequestHandler<SaveDocStatusCommand,
         // ceck if exists
         bool isExists = await _repo.ReadOnly().Where(request).AnyAsync(cancel);
 
+        var env = await _envRepo.ReadOnly().Where(request.Envelope).FirstAsync(cancel);
+        var rcv = await _rcvRepo.ReadOnly().Where(request.Receiver).FirstAsync(cancel);
+
+        request.Envelope.Id = env.Id;
+        request.Receiver.Id = rcv.Id;
+
         if (isExists)
         {
             var uReq = request.To<UpdateDocStatusCommand>();
diff --git a/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs b/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
index b04b47e7..eb420037 100644
--- a/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/DocStatus/MappingProfile.cs
@@ -14,7 +14,12 @@ public class MappingProfile : Profile
     /// </summary>
     public MappingProfile()
     {
-        CreateMap<CreateDocStatusCommand, DocumentStatus>();
-        CreateMap<UpdateDocStatusCommand, DocumentStatus>();
+        CreateMap<CreateDocStatusCommand, DocumentStatus>()
+        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
+
+        CreateMap<UpdateDocStatusCommand, DocumentStatus>()
+        .ForMember(dest => dest.Envelope, opt => opt.Ignore())
+        .ForMember(dest => dest.Receiver, opt => opt.Ignore());
     }
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
index 211bee2a..6f8b63da 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReadEnvelopeReceiverQuery.cs
@@ -113,7 +113,7 @@ public class ReadEnvelopeReceiverQueryHandler : IRequestHandler<ReadEnvelopeRece
     /// <exception cref="BadRequestException"></exception>
     public async Task<IEnumerable<EnvelopeReceiverDto>> Handle(ReadEnvelopeReceiverQuery request, CancellationToken cancel)
     {
-        var q = _repo.Read().Where(request, notnull: false);
+        var q = _repo.ReadOnly().Where(request, notnull: false);
 
         if (request.Envelope.Status is not null)
         {
diff --git a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
index 8255a43c..3b5fbf8c 100644
--- a/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
+++ b/EnvelopeGenerator.Application/EnvelopeReceivers/Queries/ReceiverAlreadySignedQuery.cs
@@ -68,6 +68,6 @@ public class ReceiverAlreadySignedQueryHandler : IRequestHandler<ReceiverAlready
     /// <returns></returns>
     public async Task<bool> Handle(ReceiverAlreadySignedQuery request, CancellationToken cancel = default)
     {
-        return await _repo.Read().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
+        return await _repo.ReadOnly().Where(request).Where(h => h.Status == EnvelopeStatus.DocumentSigned).AnyAsync(cancel);
     }
 }
\ No newline at end of file