diff --git a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Cleipnir.Flows.MassTransit.Console.csproj b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Cleipnir.Flows.MassTransit.Console.csproj
index d511e16..4ccf6de 100644
--- a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Cleipnir.Flows.MassTransit.Console.csproj
+++ b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Cleipnir.Flows.MassTransit.Console.csproj
@@ -15,6 +15,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\..\Cleipnir.Flows\Cleipnir.Flows.csproj" />
+      <ProjectReference Include="..\..\..\SourceGeneration\Cleipnir.Flows.SourceGenerator\Cleipnir.Flows.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
     </ItemGroup>
 
 </Project>
diff --git a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Program.cs b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Program.cs
index 4995b55..2d4b5f6 100644
--- a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Program.cs
+++ b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/Program.cs
@@ -40,8 +40,7 @@ private static IHostBuilder CreateHostBuilder(string[] args) =>
             {
                 services.AddFlows(c => c
                     .UseInMemoryStore()
-                    .RegisterFlow<SimpleFlow, SimpleFlows>()
-                    //.RegisterFlowsAutomatically()
+                    .RegisterFlowsAutomatically()
                 );
                 
                 services.AddMassTransit(x =>
diff --git a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlow.cs b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlow.cs
index 0fbf1b0..0d40ae1 100644
--- a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlow.cs
+++ b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlow.cs
@@ -1,4 +1,5 @@
 using Cleipnir.ResilientFunctions.Reactive.Extensions;
+using MassTransit;
 
 namespace Cleipnir.Flows.MassTransit.Console;
 
@@ -9,4 +10,10 @@ public override async Task Run()
         var msg = await Messages.FirstOfType<MyMessage>();
         System.Console.WriteLine($"SimpleFlow({msg}) executed");
     }
-}
\ No newline at end of file
+}
+
+public class SimpleFlowsHandler(SimpleFlows simpleFlows) : IConsumer<MyMessage>
+{
+    public Task Consume(ConsumeContext<MyMessage> context) 
+        => simpleFlows.SendMessage(context.Message.Value, context.Message);
+}
diff --git a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlows.cs b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlows.cs
deleted file mode 100644
index 958cbe9..0000000
--- a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlows.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Cleipnir.Flows.MassTransit.Console;
-
-public class SimpleFlows : Flows<SimpleFlow>
-{
-    public SimpleFlows(FlowsContainer flowsContainer) 
-        : base("SimpleFlow", flowsContainer, options: null) { }
-}
\ No newline at end of file
diff --git a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlowsHandler.cs b/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlowsHandler.cs
deleted file mode 100644
index 1268330..0000000
--- a/ServiceBuses/MassTransit/Cleipnir.Flows.MassTransit.Console/SimpleFlowsHandler.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using MassTransit;
-
-namespace Cleipnir.Flows.MassTransit.Console;
-
-public class SimpleFlowsHandler(SimpleFlows simpleFlows) : IConsumer<MyMessage>
-{
-    public Task Consume(ConsumeContext<MyMessage> context) 
-        => simpleFlows.SendMessage(context.Message.Value, context.Message);
-}
\ No newline at end of file