diff --git a/src/modules/Elsa.EntityFrameworkCore/Modules/Management/EFCoreWorkflowManagementPersistenceFeature.cs b/src/modules/Elsa.EntityFrameworkCore/Modules/Management/EFCoreWorkflowManagementPersistenceFeature.cs
index 0f84f93a6..06be22263 100644
--- a/src/modules/Elsa.EntityFrameworkCore/Modules/Management/EFCoreWorkflowManagementPersistenceFeature.cs
+++ b/src/modules/Elsa.EntityFrameworkCore/Modules/Management/EFCoreWorkflowManagementPersistenceFeature.cs
@@ -33,6 +33,6 @@ public class EFCoreWorkflowManagementPersistenceFeature : PersistenceFeatureBase
         base.Apply();
 
         AddStore<WorkflowInstance, EFCoreWorkflowInstanceStore>();
-        AddStore<WorkflowInstance, EFCoreWorkflowInstanceStore>();
+        AddStore<WorkflowDefinition, EFCoreWorkflowDefinitionStore>();
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/Extensions.cs b/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/Extensions.cs
index 42805a759..40beb7b49 100644
--- a/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/Extensions.cs
+++ b/src/modules/Elsa.EntityFrameworkCore/Modules/Runtime/Extensions.cs
@@ -1,6 +1,4 @@
 using Elsa.Workflows.Runtime.Features;
-using Elsa.Workflows.Runtime.Implementations;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Elsa.EntityFrameworkCore.Modules.Runtime;
 
@@ -26,13 +24,4 @@ public static class Extensions
         feature.Module.Configure(configure);
         return feature;
     }
-        
-    /// <summary>
-    /// Configures the workflow runtime to send workflow state to the <see cref="AsyncWorkflowStateExporter"/>.
-    /// </summary>
-    public static WorkflowRuntimeFeature UseAsyncWorkflowStateExporter(this WorkflowRuntimeFeature feature)
-    {
-        feature.WorkflowStateExporter = sp => ActivatorUtilities.CreateInstance<AsyncWorkflowStateExporter>(sp);
-        return feature;
-    }
 }
\ 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 9fc1782a0..0c089e079 100644
--- a/src/modules/Elsa.Workflows.Management/Features/WorkflowManagementFeature.cs
+++ b/src/modules/Elsa.Workflows.Management/Features/WorkflowManagementFeature.cs
@@ -29,6 +29,7 @@ namespace Elsa.Workflows.Management.Features;
 [DependsOn(typeof(MediatorFeature))]
 [DependsOn(typeof(SystemClockFeature))]
 [DependsOn(typeof(WorkflowsFeature))]
+[DependsOn(typeof(WorkflowDefinitionsFeature))]
 public class WorkflowManagementFeature : FeatureBase
 {
     private const string PrimitivesCategory = "Primitives";
diff --git a/src/modules/Elsa.Workflows.Runtime/Extensions/ModuleExtensions.cs b/src/modules/Elsa.Workflows.Runtime/Extensions/ModuleExtensions.cs
index 42d09d2cc..3a95c04ce 100644
--- a/src/modules/Elsa.Workflows.Runtime/Extensions/ModuleExtensions.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Extensions/ModuleExtensions.cs
@@ -39,4 +39,10 @@ public static class ModuleExtensions
         feature.Module.Configure(configure);
         return feature;
     }
+    
+    public static WorkflowRuntimeFeature UseAsyncWorkflowStateExporter(this WorkflowRuntimeFeature feature, Action<AsyncWorkflowStateExporterFeature>? configure = default)
+    {
+        feature.Module.Configure(configure);
+        return feature;
+    }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Runtime/Features/AsyncWorkflowStateExporterFeature.cs b/src/modules/Elsa.Workflows.Runtime/Features/AsyncWorkflowStateExporterFeature.cs
new file mode 100644
index 000000000..a38e7f300
--- /dev/null
+++ b/src/modules/Elsa.Workflows.Runtime/Features/AsyncWorkflowStateExporterFeature.cs
@@ -0,0 +1,26 @@
+using Elsa.Features.Abstractions;
+using Elsa.Features.Attributes;
+using Elsa.Features.Services;
+using Elsa.Workflows.Management.Features;
+using Elsa.Workflows.Runtime.Implementations;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Elsa.Workflows.Runtime.Features;
+
+/// <summary>
+/// Configures and enables <see cref="AsyncWorkflowStateExporter"/>.
+/// </summary>
+[DependsOn(typeof(WorkflowInstancesFeature))]
+public class AsyncWorkflowStateExporterFeature : FeatureBase
+{
+    /// <inheritdoc />
+    public AsyncWorkflowStateExporterFeature(IModule module) : base(module)
+    {
+    }
+
+    /// <inheritdoc />
+    public override void Configure()
+    {
+        Module.Configure<WorkflowRuntimeFeature>(workflowRuntime => workflowRuntime.WorkflowStateExporter = sp => ActivatorUtilities.CreateInstance<AsyncWorkflowStateExporter>(sp));
+    }
+}
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Runtime/Features/WorkflowRuntimeFeature.cs b/src/modules/Elsa.Workflows.Runtime/Features/WorkflowRuntimeFeature.cs
index b2de895d1..8ceefaee4 100644
--- a/src/modules/Elsa.Workflows.Runtime/Features/WorkflowRuntimeFeature.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Features/WorkflowRuntimeFeature.cs
@@ -72,7 +72,7 @@ public class WorkflowRuntimeFeature : FeatureBase
     /// <summary>
     /// A factory that instantiates an <see cref="IWorkflowStateExporter"/>.
     /// </summary>
-    public Func<IServiceProvider, IWorkflowStateExporter> WorkflowStateExporter { get; set; } = sp => sp.GetRequiredService<NoopWorkflowStateExporter>();
+    public Func<IServiceProvider, IWorkflowStateExporter> WorkflowStateExporter { get; set; } = ActivatorUtilities.GetServiceOrCreateInstance<NoopWorkflowStateExporter>;
 
     /// <summary>
     /// A factory that instantiates an <see cref="ITaskDispatcher"/>.
@@ -145,8 +145,6 @@ public class WorkflowRuntimeFeature : FeatureBase
             .AddWorkflowDefinitionProvider<ClrWorkflowDefinitionProvider>()
             
             // Workflow state exporter.
-            .AddSingleton<NoopWorkflowStateExporter>()
-            .AddSingleton<AsyncWorkflowStateExporter>()
             .AddSingleton(WorkflowStateExporter)
 
             // Domain handlers.
diff --git a/src/samples/aspnet/Elsa.Samples.TelnyxIntegration/Program.cs b/src/samples/aspnet/Elsa.Samples.TelnyxIntegration/Program.cs
index eee300b04..024e942f2 100644
--- a/src/samples/aspnet/Elsa.Samples.TelnyxIntegration/Program.cs
+++ b/src/samples/aspnet/Elsa.Samples.TelnyxIntegration/Program.cs
@@ -63,7 +63,7 @@ services
             runtime.UseDefaultRuntime(dr => dr.UseEntityFrameworkCore(ef => ef.UseSqlite(sqliteConnectionString)));
             runtime.UseExecutionLogRecords(d => d.UseEntityFrameworkCore(ef => ef.UseSqlite()));
             runtime.UseExecutionLogRecords(e => e.UseEntityFrameworkCore(ef => ef.UseSqlite(sqliteConnectionString)));
-            runtime.WorkflowStateExporter = sp => sp.GetRequiredService<AsyncWorkflowStateExporter>();
+            runtime.UseAsyncWorkflowStateExporter();
         })
         .UseActivityDefinitions(feature => feature.UseEntityFrameworkCore(ef => ef.UseSqlite(sqliteConnectionString)))
         .UseJobs(jobs => jobs.ConfigureOptions = options => options.WorkerCount = 10)