diff --git a/README.md b/README.md
index 80d9b59..49f3540 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # dbosoft Rebus Extensions 
 
-This repository will contain following extensions to [Rebus](https://github.com/rebus-org/rebus):
+This repository contains following extensions to [Rebus](https://github.com/rebus-org/rebus):
 
 - Dbosoft.Rebus.Configuration  
   A extension for configuring rebus via dependency injection.
@@ -9,4 +9,3 @@ This repository will contain following extensions to [Rebus](https://github.com/
   A extension that uses rebus sagas to manage long running operations.
   
 
-Development is in progress and no public release is currently available.
diff --git a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs
index 50b9936..3ff9d48 100644
--- a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs
+++ b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs
@@ -1,6 +1,8 @@
-using Microsoft.Extensions.Configuration;
+using System;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Rebus.Config;
+using Rebus.Persistence.FileSystem;
 using Rebus.Persistence.InMem;
 using Rebus.Timeouts;
 
@@ -13,7 +15,7 @@ public DefaultTimeoutsStoreSelector(IConfiguration configuration, ILogger log) :
     {
     }
 
-    public override string[] AcceptedConfigTypes => new []{"inmemory" };
+    public override string[] AcceptedConfigTypes => new []{"inmemory", "filesystem" };
     public override string ConfigurationName => "store";
 
     protected override void ConfigureByType(string busType, StandardConfigurer<ITimeoutManager> configurer)
@@ -23,6 +25,14 @@ protected override void ConfigureByType(string busType, StandardConfigurer<ITime
             case "inmemory":
                 configurer.StoreInMemory();
                 break;
+            case "filesystem":
+                var path = Configuration[$"{ConfigurationName}:path"];
+
+                if(path == null)
+                    throw new InvalidOperationException($"Missing configuration entry for {ConfigurationName}::path.");
+
+                configurer.UseFileSystem(path);
+                break;
         }
     }
 
diff --git a/src/Rebus.Operations/Rebus.Operations.Abstractions/Workflow/IOperationMessaging.cs b/src/Rebus.Operations/Rebus.Operations.Abstractions/Workflow/IOperationMessaging.cs
index 7ffe067..8844aaf 100644
--- a/src/Rebus.Operations/Rebus.Operations.Abstractions/Workflow/IOperationMessaging.cs
+++ b/src/Rebus.Operations/Rebus.Operations.Abstractions/Workflow/IOperationMessaging.cs
@@ -5,7 +5,7 @@ namespace Dbosoft.Rebus.Operations.Workflow;
 
 public interface IOperationMessaging
 {
-    void DispatchTaskMessage(object command, IOperationTask task);
+    Task DispatchTaskMessage(object command, IOperationTask task);
     Task DispatchTaskStatusEventAsync(string commandType, OperationTaskStatusEvent message);
     Task DispatchTaskStatusEventAsync(OperationTaskStatusEvent message);
     Task DispatchOperationStatusEventAsync(OperationStatusEvent operationStatusEvent);
diff --git a/src/Rebus.Operations/Rebus.Operations.Core/Workflow/ProcessOperationSaga.cs b/src/Rebus.Operations/Rebus.Operations.Core/Workflow/ProcessOperationSaga.cs
index 3ed3d1d..d2774fa 100644
--- a/src/Rebus.Operations/Rebus.Operations.Core/Workflow/ProcessOperationSaga.cs
+++ b/src/Rebus.Operations/Rebus.Operations.Core/Workflow/ProcessOperationSaga.cs
@@ -87,7 +87,7 @@ public async Task Handle(CreateNewOperationTaskCommand message)
                 throw new InvalidOperationException($"unknown command type '{message.CommandType}'");
 
             Data.Tasks.Add(message.TaskId, messageType.AssemblyQualifiedName!);
-            _workflow.Messaging.DispatchTaskMessage(command,task);
+            await _workflow.Messaging.DispatchTaskMessage(command,task);
         }
 
 
diff --git a/src/Rebus.Operations/Rebus.Operations.Core/Workflow/RebusOperationMessaging.cs b/src/Rebus.Operations/Rebus.Operations.Core/Workflow/RebusOperationMessaging.cs
index 245a923..8b46d5e 100644
--- a/src/Rebus.Operations/Rebus.Operations.Core/Workflow/RebusOperationMessaging.cs
+++ b/src/Rebus.Operations/Rebus.Operations.Core/Workflow/RebusOperationMessaging.cs
@@ -18,14 +18,14 @@ public RebusOperationMessaging(IBus bus,
         TaskDispatcher = taskDispatcher;
     }
 
-    public virtual void DispatchTaskMessage(object command, IOperationTask task)
+    public virtual Task DispatchTaskMessage(object command, IOperationTask task)
     {
         var messageType = command.GetType();
         var outboundMessage = Activator.CreateInstance(
             typeof(OperationTaskSystemMessage<>).MakeGenericType(messageType),
             command, task.OperationId, task.InitiatingTaskId, task.Id);
 
-        _bus.SendLocal(outboundMessage);
+        return _bus.SendLocal(outboundMessage);
     }
 
     public Task DispatchTaskStatusEventAsync(string commandType, OperationTaskStatusEvent message)