diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
index fd557599..599a84c8 100644
--- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommand.cs
@@ -36,7 +36,10 @@ public record CreateEnvelopeCommand : IRequest<EnvelopeDto?>
     public int UserId { get; set; }
 
     /// <summary>
-    /// if true, use <seealso cref="IEnvelopeExecutor"/>; otherwise, use <seealso cref="IRepository{Envelope}"/>
+    /// Determines which component is used for envelope processing.
+    /// When <c>true</c>, processing is delegated to <see cref="IEnvelopeExecutor"/>; 
+    /// when <c>false</c>, <see cref="IRepository{Envelope}"/> is used instead. 
+    /// Note: <see cref="IRepository{Envelope}"/> should only be used in testing scenarios.
     /// </summary>
     [JsonIgnore]
     [NotMapped]
diff --git a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
index e7a39711..1fde1bf2 100644
--- a/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
+++ b/EnvelopeGenerator.Application/Envelopes/Commands/CreateEnvelopeCommandHandler.cs
@@ -2,6 +2,9 @@
 using EnvelopeGenerator.Application.Interfaces.SQLExecutor;
 using EnvelopeGenerator.Application.Dto;
 using MediatR;
+using Microsoft.Extensions.DependencyInjection;
+using DigitalData.Core.Abstraction.Application.Repository;
+using EnvelopeGenerator.Domain.Entities;
 
 namespace EnvelopeGenerator.Application.Envelopes.Commands;
 
@@ -10,18 +13,22 @@ namespace EnvelopeGenerator.Application.Envelopes.Commands;
 /// </summary>
 public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeCommand, EnvelopeDto?>
 {
-    private readonly IEnvelopeExecutor _envelopeExecutor;
+    private readonly IServiceProvider _provider;
+
+    private IEnvelopeExecutor Executor => _provider.GetRequiredService<IEnvelopeExecutor>();
+
+    private IRepository<Envelope> Repository => _provider.GetRequiredService<IRepository<Envelope>>();
 
     private readonly IMapper _mapper;
 
     /// <summary>
     /// 
     /// </summary>
-    /// <param name="envelopeExecutor"></param>
+    /// <param name="provider"></param>
     /// <param name="mapper"></param>
-    public CreateEnvelopeCommandHandler(IEnvelopeExecutor envelopeExecutor, IMapper mapper)
+    public CreateEnvelopeCommandHandler(IServiceProvider provider, IMapper mapper)
     {
-        _envelopeExecutor = envelopeExecutor;
+        _provider = provider;
         _mapper = mapper;
     }
 
@@ -29,12 +36,14 @@ public class CreateEnvelopeCommandHandler : IRequestHandler<CreateEnvelopeComman
     /// 
     /// </summary>
     /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
+    /// <param name="cancel"></param>
     /// <returns></returns>
-    public async Task<EnvelopeDto?> Handle(CreateEnvelopeCommand request, CancellationToken cancellationToken)
+    public async Task<EnvelopeDto?> Handle(CreateEnvelopeCommand request, CancellationToken cancel)
     {
-        var envelope = await _envelopeExecutor.CreateEnvelopeAsync(request.UserId, request.Title, request.Message, request.TFAEnabled, cancellationToken);
+        var envelope = request.UseSQLExecutor
+            ? await Executor.CreateEnvelopeAsync(request.UserId, request.Title, request.Message, request.TFAEnabled, cancel)
+            : await Repository.CreateAsync(request, cancel);
 
         return _mapper.Map<EnvelopeDto>(envelope);
     }
-}
+}
\ No newline at end of file