diff --git a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
index 05f91f97..8247af54 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/AnnotationHandler.cs
@@ -8,6 +8,7 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// <summary>
 /// 
 /// </summary>
+[Obsolete("The PSPDFKit library is deprecated.")]
 public class AnnotationHandler : INotificationHandler<DocSignedNotification>
 {
     /// <summary>
diff --git a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
index 0564ec95..6cbaf41a 100644
--- a/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
+++ b/EnvelopeGenerator.Application/Common/Notifications/DocSigned/Handlers/DocStatusHandler.cs
@@ -9,6 +9,7 @@ namespace EnvelopeGenerator.Application.Common.Notifications.DocSigned.Handlers;
 /// <summary>
 /// 
 /// </summary>
+[Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
 public class DocStatusHandler : INotificationHandler<DocSignedNotification>
 {
     private const string BlankAnnotationJson = "{}";
@@ -30,6 +31,7 @@ public class DocStatusHandler : INotificationHandler<DocSignedNotification>
     /// <param name="notification"></param>
     /// <param name="cancel"></param>
     /// <returns></returns>
+    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
     public Task Handle(DocSignedNotification notification, CancellationToken cancel) => _sender.Send(new CreateDocStatusCommand()
     {
         EnvelopeId = notification.EnvelopeReceiver.EnvelopeId,
diff --git a/EnvelopeGenerator.Application/Signature/Behaviors/AnnotationBehavior.cs b/EnvelopeGenerator.Application/Signature/Behaviors/AnnotationBehavior.cs
index 00d08747..848271b6 100644
--- a/EnvelopeGenerator.Application/Signature/Behaviors/AnnotationBehavior.cs
+++ b/EnvelopeGenerator.Application/Signature/Behaviors/AnnotationBehavior.cs
@@ -10,6 +10,7 @@ namespace EnvelopeGenerator.Application.Signature.Behaviors;
 /// Pipeline behavior that saves annotations.
 /// Executes first in the signing process.
 /// </summary>
+[Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
 public class AnnotationBehavior : IPipelineBehavior<SignCommand, Unit>
 {
     private readonly IRepository<ElementAnnotation> _repo;
diff --git a/EnvelopeGenerator.Application/Signature/Behaviors/DocStatusBehavior.cs b/EnvelopeGenerator.Application/Signature/Behaviors/DocStatusBehavior.cs
index 666c4231..625fd143 100644
--- a/EnvelopeGenerator.Application/Signature/Behaviors/DocStatusBehavior.cs
+++ b/EnvelopeGenerator.Application/Signature/Behaviors/DocStatusBehavior.cs
@@ -33,6 +33,7 @@ public class DocStatusBehavior : IPipelineBehavior<SignCommand, Unit>
     /// <param name="next"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
+    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
     public async Task<Unit> Handle(SignCommand request, RequestHandlerDelegate<Unit> next, CancellationToken cancellationToken)
     {
         await _sender.Send(new CreateDocStatusCommand()
diff --git a/EnvelopeGenerator.Application/Signature/Commands/SignCommand.cs b/EnvelopeGenerator.Application/Signature/Commands/SignCommand.cs
index 46cc8a22..312d6dae 100644
--- a/EnvelopeGenerator.Application/Signature/Commands/SignCommand.cs
+++ b/EnvelopeGenerator.Application/Signature/Commands/SignCommand.cs
@@ -19,6 +19,7 @@ public record SignCommand : IRequest
     /// <summary>
     /// The PSPDFKit annotation data.
     /// </summary>
+    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
     public PsPdfKitAnnotation? PsPdfKitAnnotation { get; init; }
 
     /// <summary>
diff --git a/EnvelopeGenerator.Web/Controllers/AnnotationController.cs b/EnvelopeGenerator.Web/Controllers/AnnotationController.cs
index 16dedf25..8ba1b3cf 100644
--- a/EnvelopeGenerator.Web/Controllers/AnnotationController.cs
+++ b/EnvelopeGenerator.Web/Controllers/AnnotationController.cs
@@ -1,5 +1,6 @@
 using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.Core.Exceptions;
+using EnvelopeGenerator.Application.Common.Dto;
 using EnvelopeGenerator.Application.Common.Extensions;
 using EnvelopeGenerator.Application.Common.Interfaces.Services;
 using EnvelopeGenerator.Application.Common.Notifications.DocSigned;
@@ -46,6 +47,7 @@ public class AnnotationController : ControllerBase
 
     [Authorize(Roles = Role.ReceiverFull)]
     [HttpPost]
+    [Obsolete("This notification is deprecated. Use Signature.Commands.SignCommand instead.")]
     public async Task<IActionResult> CreateOrUpdate([FromBody] PsPdfKitAnnotation? psPdfKitAnnotation = null, CancellationToken cancel = default)
     {
         // get claims