diff --git a/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings b/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings
index af314d94e..9d2dd8dfd 100644
--- a/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings
+++ b/src/core/Elsa.Core/Elsa.Core.csproj.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=activities_005Ccontrolflow_005Cfor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=activities_005Csignaling_005Cactivities_005Creceivesignal/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=activities_005Csignaling_005Creceivesignal/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=activities_005Csignaling_005Csignaled/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
index f420f156e..97932b10f 100644
--- a/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
+++ b/src/core/Elsa.Core/Extensions/ElsaServiceCollectionExtensions.cs
@@ -59,22 +59,17 @@ namespace Microsoft.Extensions.DependencyInjection
                 .AddTransient<T>()
                 .AddTransient<IActivity>(sp => sp.GetRequiredService<T>());
 
-        public static IServiceCollection AddWorkflow<T>(this IServiceCollection services) where T : class, IWorkflow
-        {
-            services.TryAddSingleton<T>();
-            services.TryAddSingleton<IWorkflow>(sp => sp.GetRequiredService<T>());
-            return services;
-        }
+        public static IServiceCollection AddWorkflow<T>(this IServiceCollection services) where T : class, IWorkflow =>
+            services
+                .AddSingleton<T>()
+                .AddSingleton<IWorkflow>(sp => sp.GetRequiredService<T>());
 
         public static IServiceCollection AddWorkflow(this IServiceCollection services, IWorkflow workflow) =>
             services
                 .AddSingleton(workflow.GetType(), workflow)
                 .AddTransient(sp => workflow);
 
-        public static IServiceCollection StartWorkflow<T>(this IServiceCollection services) where T : class, IWorkflow =>
-            services
-                .AddWorkflow<T>()
-                .AddHostedService<StartWorkflow<T>>();
+        public static IServiceCollection StartWorkflow<T>(this IServiceCollection services) where T : class, IWorkflow => services.AddHostedService<StartWorkflow<T>>();
 
         private static IServiceCollection AddMediatR(this ElsaOptions options) => options.Services.AddMediatR(mediatr => mediatr.AsScoped(), typeof(IActivity));
 
@@ -98,7 +93,7 @@ namespace Microsoft.Extensions.DependencyInjection
                 .AddSingleton<IWorkflowSchedulerQueue, WorkflowSchedulerQueue>()
                 .AddSingleton<IActivityActivator, ActivityActivator>()
                 .AddScoped<IWorkflowRunner, WorkflowRunner>()
-                .AddScoped<IWorkflowInterruptor, WorkflowInterruptor>()
+                .AddScoped<IWorkflowTriggerInterruptor, WorkflowTriggerInterruptor>()
                 .AddSingleton<IActivityDescriber, ActivityDescriber>()
                 .AddSingleton<IWorkflowFactory, WorkflowFactory>()
                 .AddSingleton<IActivityFactory, ActivityFactory>()
@@ -155,10 +150,11 @@ namespace Microsoft.Extensions.DependencyInjection
                 .AddActivity<SetVariable>()
                 .AddActivity<SetContextId>()
                 .AddActivity<ReceiveSignal>()
-                .AddTriggerProvider<ReceiveSignalTriggerProvider>()
                 .AddActivity<SendSignal>()
-                .AddScoped<ISignaler, Signaler>()
                 .AddActivity<RunWorkflow>()
+                .AddActivity<InterruptTrigger>()
+                .AddScoped<ISignaler, Signaler>()
+                .AddTriggerProvider<ReceiveSignalTriggerProvider>()
                 .AddTriggerProvider<RunWorkflowTriggerProvider>();
     }
 }
\ No newline at end of file