diff --git a/src/modules/Elsa.Common/Features/SystemClockFeature.cs b/src/modules/Elsa.Common/Features/SystemClockFeature.cs
index 027319e11..04aea968f 100644
--- a/src/modules/Elsa.Common/Features/SystemClockFeature.cs
+++ b/src/modules/Elsa.Common/Features/SystemClockFeature.cs
@@ -6,9 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.Common.Features;
 
-/// <summary>
 /// Configures the system clock.
-/// </summary>
 public class SystemClockFeature : FeatureBase
 {
     /// <inheritdoc />
@@ -19,6 +17,6 @@ public class SystemClockFeature : FeatureBase
     /// <inheritdoc />
     public override void Apply()
     {
-        Services.AddScoped<ISystemClock, SystemClock>();
+        Services.AddSingleton<ISystemClock, SystemClock>();
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Scheduling/Features/SchedulingFeature.cs b/src/modules/Elsa.Scheduling/Features/SchedulingFeature.cs
index 368ab9ba2..19c634c6a 100644
--- a/src/modules/Elsa.Scheduling/Features/SchedulingFeature.cs
+++ b/src/modules/Elsa.Scheduling/Features/SchedulingFeature.cs
@@ -42,12 +42,12 @@ public class SchedulingFeature : FeatureBase
     public override void Apply()
     {
         Services
+            .AddSingleton<IScheduler, LocalScheduler>()
+            .AddSingleton<CronosCronParser>()
+            .AddSingleton(CronParser)
             .AddScoped<ITriggerScheduler, DefaultTriggerScheduler>()
             .AddScoped<IBookmarkScheduler, DefaultBookmarkScheduler>()
-            .AddScoped<IScheduler, LocalScheduler>()
             .AddScoped<DefaultWorkflowScheduler>()
-            .AddScoped<CronosCronParser>()
-            .AddScoped(CronParser)
             .AddScoped(WorkflowScheduler)
             .AddHandlersFrom<ScheduleWorkflows>();
 
diff --git a/src/modules/Elsa.Scheduling/Services/DefaultWorkflowScheduler.cs b/src/modules/Elsa.Scheduling/Services/DefaultWorkflowScheduler.cs
index d1a8d22f3..6bde761c2 100644
--- a/src/modules/Elsa.Scheduling/Services/DefaultWorkflowScheduler.cs
+++ b/src/modules/Elsa.Scheduling/Services/DefaultWorkflowScheduler.cs
@@ -8,22 +8,12 @@ namespace Elsa.Scheduling.Services;
 /// <summary>
 /// A default implementation of <see cref="IWorkflowScheduler"/> that uses the <see cref="LocalScheduler"/>.
 /// </summary>
-public class DefaultWorkflowScheduler : IWorkflowScheduler
+public class DefaultWorkflowScheduler(IScheduler scheduler) : IWorkflowScheduler
 {
-    private readonly IScheduler _scheduler;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DefaultWorkflowScheduler"/> class.
-    /// </summary>
-    public DefaultWorkflowScheduler(IScheduler scheduler)
-    {
-        _scheduler = scheduler;
-    }
-
     /// <inheritdoc />
     public async ValueTask ScheduleAtAsync(string taskName, DispatchWorkflowDefinitionRequest request, DateTimeOffset at, CancellationToken cancellationToken = default)
     {
-        await _scheduler.ScheduleAsync(taskName, new RunWorkflowTask(request), new SpecificInstantSchedule(at), cancellationToken);
+        await scheduler.ScheduleAsync(taskName, new RunWorkflowTask(request), new SpecificInstantSchedule(at), cancellationToken);
     }
 
     /// <inheritdoc />
@@ -31,7 +21,7 @@ public class DefaultWorkflowScheduler : IWorkflowScheduler
     {
         var task = new ResumeWorkflowTask(request);
         var schedule = new SpecificInstantSchedule(at);
-        await _scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
+        await scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
     }
 
     /// <inheritdoc />
@@ -39,7 +29,7 @@ public class DefaultWorkflowScheduler : IWorkflowScheduler
     {
         var task = new RunWorkflowTask(request);
         var schedule = new RecurringSchedule(startAt, interval);
-        await _scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
+        await scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
     }
 
     /// <inheritdoc />
@@ -47,7 +37,7 @@ public class DefaultWorkflowScheduler : IWorkflowScheduler
     {
         var task = new ResumeWorkflowTask(request);
         var schedule = new RecurringSchedule(startAt, interval);
-        await _scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
+        await scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
     }
 
     /// <inheritdoc />
@@ -55,7 +45,7 @@ public class DefaultWorkflowScheduler : IWorkflowScheduler
     {
         var task = new RunWorkflowTask(request);
         var schedule = new CronSchedule(cronExpression);
-        await _scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
+        await scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
     }
 
     /// <inheritdoc />
@@ -63,12 +53,12 @@ public class DefaultWorkflowScheduler : IWorkflowScheduler
     {
         var task = new ResumeWorkflowTask(request);
         var schedule = new CronSchedule(cronExpression);
-        await _scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
+        await scheduler.ScheduleAsync(taskName, task, schedule, cancellationToken);
     }
     
     /// <inheritdoc />
-    public async ValueTask UnscheduleAsync(string workflowInstanceId, CancellationToken cancellationToken = default)
+    public async ValueTask UnscheduleAsync(string taskName, CancellationToken cancellationToken = default)
     {
-        await _scheduler.ClearScheduleAsync(workflowInstanceId, cancellationToken);
+        await scheduler.ClearScheduleAsync(taskName, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Management/Features/WorkflowManagementFeature.cs b/src/modules/Elsa.Workflows.Management/Features/WorkflowManagementFeature.cs
index cfb45929c..3fdc5adf8 100644
--- a/src/modules/Elsa.Workflows.Management/Features/WorkflowManagementFeature.cs
+++ b/src/modules/Elsa.Workflows.Management/Features/WorkflowManagementFeature.cs
@@ -101,7 +101,6 @@ public class WorkflowManagementFeature : FeatureBase
     /// <summary>
     /// Adds all types implementing <see cref="IActivity"/> to the system.
     /// </summary>
-    [RequiresUnreferencedCode("The assembly containing the specified marker type will be scanned for activity types.")]
     public WorkflowManagementFeature AddActivitiesFrom<TMarker>()
     {
         var activityTypes = typeof(TMarker).Assembly.GetExportedTypes()