diff --git a/EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs b/EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs
index 0a6457c4..051bc638 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSignedNotification.cs
@@ -1,5 +1,6 @@
 using EnvelopeGenerator.Application.Dto.EnvelopeReceiver;
 using MediatR;
+using System.Dynamic;
 
 namespace EnvelopeGenerator.Application.Common.Notifications;
 
@@ -9,6 +10,10 @@ namespace EnvelopeGenerator.Application.Common.Notifications;
 /// <param name="Original"></param>
 public record DocSignedNotification(EnvelopeReceiverDto Original) : EnvelopeReceiverDto(Original), INotification
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    public required ExpandoObject Annotations { get; init; }
 }
 
 /// <summary>
@@ -20,14 +25,17 @@ public static class DocSignedNotificationExtensions
     /// Converts an <see cref="EnvelopeReceiverDto"/> to a <see cref="DocSignedNotification"/>.
     /// </summary>
     /// <param name="dto">The DTO to convert.</param>
+    /// <param name="annotations"></param>
     /// <returns>A new <see cref="DocSignedNotification"/> instance.</returns>
-    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto) => new (dto);
+    public static DocSignedNotification ToDocSignedNotification(this EnvelopeReceiverDto dto, ExpandoObject annotations)
+        => new(dto) { Annotations = annotations };
 
     /// <summary>
     /// Asynchronously converts a <see cref="Task{EnvelopeReceiverDto}"/> to a <see cref="DocSignedNotification"/>.
     /// </summary>
     /// <param name="dtoTask">The task that returns the DTO to convert.</param>
+    /// <param name="annotations"></param>
     /// <returns>A task that represents the asynchronous conversion operation.</returns>
-    public static async Task<DocSignedNotification> ToDocSignedNotification(this Task<EnvelopeReceiverDto> dtoTask)
-        => new(await dtoTask);
+    public static async Task<DocSignedNotification?> ToDocSignedNotification(this Task<EnvelopeReceiverDto?> dtoTask, ExpandoObject annotations)
+        => await dtoTask is EnvelopeReceiverDto dto ? new(dto) { Annotations = annotations } : null;
 }
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationStatusHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationStatusHandler.cs
index 0975a7c1..512ba9c9 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/Handlers/DocSignedNotificationStatusHandler.cs
@@ -1,4 +1,7 @@
-using MediatR;
+using EnvelopeGenerator.Application.DocStatus.Commands;
+using EnvelopeGenerator.Domain.Constants;
+using MediatR;
+using Newtonsoft.Json;
 
 namespace EnvelopeGenerator.Application.Common.Notifications.Handlers;
 
@@ -7,15 +10,30 @@ namespace EnvelopeGenerator.Application.Common.Notifications.Handlers;
 /// </summary>
 public class DocSignedNotificationStatusHandler : INotificationHandler<DocSignedNotification>
 {
+    private readonly ISender _sender;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="sender"></param>
+    public DocSignedNotificationStatusHandler(ISender sender)
+    {
+        _sender = sender;
+    }
+
     /// <summary>
     /// 
     /// </summary>
     /// <param name="notification"></param>
-    /// <param name="cancellationToken"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public Task Handle(DocSignedNotification notification, CancellationToken cancellationToken)
+    public async Task Handle(DocSignedNotification notification, CancellationToken cancel)
     {
-        throw new NotImplementedException();
+        await _sender.Send(new SaveDocStatusCommand()
+        {
+            Envelope = new() { Id = notification.EnvelopeId },
+            Receiver = new() { Id = notification.ReceiverId},
+            Value = JsonConvert.SerializeObject(notification.Annotations, Format.Json.ForAnnotations)
+        }, cancel);
     }
-}
+}
\ No newline at end of file
diff --git a/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs b/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
index 039bf948..f12821c0 100644
--- a/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
+++ b/EnvelopeGenerator.Application/DocStatus/Commands/SaveDocStatusCommand.cs
@@ -14,34 +14,6 @@ namespace EnvelopeGenerator.Application.DocStatus.Commands;
 /// </summary>
 public record SaveDocStatusCommand : ModifyDocStatusCommandBase, IRequest<DocumentStatusDto?>;
 
-/// <summary>
-/// 
-/// </summary>
-public static class Extensions
-{
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <param name="mediator"></param>
-    /// <param name="uuid"></param>
-    /// <param name="signature"></param>
-    /// <param name="value"></param>
-    /// <param name="cancel"></param>
-    /// <returns></returns>
-    public static async Task<int?> SignDocAsync(this IMediator mediator, string uuid, string signature, string value, CancellationToken cancel = default)
-    {
-        
-        var docStatus = await mediator.Send(new SaveDocStatusCommand()
-           {
-               Envelope = new() { Uuid = uuid },
-               Receiver = new() { Signature = signature },
-               Value = value
-           }, cancel);
-
-        return docStatus?.Id;
-    }
-}
-
 /// <summary>
 /// 
 /// </summary>
diff --git a/EnvelopeGenerator.Domain/Constants/Format.cs b/EnvelopeGenerator.Domain/Constants/Format.cs
index 2f5e28af..1f131e5e 100644
--- a/EnvelopeGenerator.Domain/Constants/Format.cs
+++ b/EnvelopeGenerator.Domain/Constants/Format.cs
@@ -14,6 +14,12 @@ namespace EnvelopeGenerator.Domain.Constants
                 Formatting = Formatting.Indented,
                 NullValueHandling = NullValueHandling.Include
             };
+            public static readonly JsonSerializerSettings ForAnnotations = new JsonSerializerSettings()
+            {
+                ContractResolver = new CamelCasePropertyNamesContractResolver(),
+                Formatting = Formatting.None,                
+                NullValueHandling = NullValueHandling.Ignore
+            };
         }
         #endregion
     }
diff --git a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
index 761c3c9b..e22d5d32 100644
--- a/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
+++ b/EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
@@ -13,6 +13,8 @@ using System.Dynamic;
 using EnvelopeGenerator.Application.EnvelopeReceivers.Queries;
 using EnvelopeGenerator.Application.DocStatus.Commands;
 using Newtonsoft.Json;
+using EnvelopeGenerator.Application.Common.Notifications;
+using DigitalData.Core.Exceptions;
 
 namespace EnvelopeGenerator.Web.Controllers;
 
@@ -64,7 +66,11 @@ public class EnvelopeController : BaseController
         if (await _mediator.IsSignedAsync(uuid, signature, cancel))
             return Problem(statusCode: 403);
 
-        await _mediator.SignDocAsync(uuid, signature, JsonConvert.SerializeObject(annotations), cancel);
+        var notification = await _mediator.ReadEnvelopeReceiverAsync(envelopeKey, cancel)
+            .ToDocSignedNotification(annotations)
+            ?? throw new NotFoundException("Envelope receiver is not found.");
+
+        await _mediator.Publish(notification, cancel);
 
         EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);