diff --git a/src/bundles/Elsa/Elsa.csproj b/src/bundles/Elsa/Elsa.csproj
index 3d5aec1d6..2b3319239 100644
--- a/src/bundles/Elsa/Elsa.csproj
+++ b/src/bundles/Elsa/Elsa.csproj
@@ -20,7 +20,6 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\common\Elsa.Api.Common\Elsa.Api.Common.csproj" />
-        <ProjectReference Include="..\..\modules\Elsa.Mediator\Elsa.Mediator.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Workflows.Core\Elsa.Workflows.Core.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Workflows.Management\Elsa.Workflows.Management.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Workflows.Runtime\Elsa.Workflows.Runtime.csproj" />
diff --git a/src/bundles/Elsa/Features/AppFeature.cs b/src/bundles/Elsa/Features/AppFeature.cs
index 9a37a7411..0a72a3396 100644
--- a/src/bundles/Elsa/Features/AppFeature.cs
+++ b/src/bundles/Elsa/Features/AppFeature.cs
@@ -10,12 +10,17 @@ namespace Elsa.Features;
 [DependsOn(typeof(ElsaFeature))]
 public class AppFeature : FeatureBase
 {
+    /// <inheritdoc />
     public AppFeature(IModule module) : base(module)
     {
     }
     
+    /// <summary>
+    /// The configurator to invoke.
+    /// </summary>
     public Action<IModule>? Configurator { get; set; }
 
+    /// <inheritdoc />
     public override void Configure()
     {
         Configurator?.Invoke(Module);
diff --git a/src/common/Elsa.Mediator/Elsa.Mediator.csproj b/src/common/Elsa.Mediator/Elsa.Mediator.csproj
index 2ba636fc7..2ca87f6a2 100644
--- a/src/common/Elsa.Mediator/Elsa.Mediator.csproj
+++ b/src/common/Elsa.Mediator/Elsa.Mediator.csproj
@@ -18,10 +18,4 @@
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     </ItemGroup>
 
-    <ItemGroup><!--        <ProjectReference Include="..\..\common\Elsa.Features\Elsa.Features.csproj" />-->
-<!--        <ProjectReference Include="..\Elsa.Common\Elsa.Common.csproj" />-->
-    
-      <Folder Include="Features\" />
-    </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/common/Elsa.Mediator/Extensions/DependencyInjectionExtensions.cs b/src/common/Elsa.Mediator/Extensions/DependencyInjectionExtensions.cs
index 15439f662..3fb5b9261 100644
--- a/src/common/Elsa.Mediator/Extensions/DependencyInjectionExtensions.cs
+++ b/src/common/Elsa.Mediator/Extensions/DependencyInjectionExtensions.cs
@@ -20,7 +20,7 @@ using Microsoft.Extensions.Options;
 namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>
-/// Adds extension methods to <see cref="IModule"/> that enable &amp; configure mediator specific features.
+/// Adds mediator services to the <see cref="IServiceCollection"/>.
 /// </summary>
 [PublicAPI]
 public static class DependencyInjectionExtensions
@@ -40,25 +40,33 @@ public static class DependencyInjectionExtensions
                 .AddSingleton<IRequestPipeline, RequestPipeline>()
                 .AddSingleton<ICommandPipeline, CommandPipeline>()
                 .AddSingleton<INotificationPipeline, NotificationPipeline>()
-                .AddSingleton<INotificationsChannel, NotificationsChannel>()
-                .AddSingleton<ICommandsChannel, CommandsChannel>()
-                .AddSingleton<IJobsChannel, JobsChannel>()
-                .AddSingleton<IJobQueue, JobQueue>()
-                .AddHostedService<JobRunnerHostedService>()
-                .AddHostedService(sp =>
-                {
-                    var options = sp.GetRequiredService<IOptions<MediatorOptions>>().Value;
-                    return ActivatorUtilities.CreateInstance<BackgroundCommandSenderHostedService>(sp, options.CommandWorkerCount);
-                })
-                .AddHostedService(sp =>
-                {
-                    var options = sp.GetRequiredService<IOptions<MediatorOptions>>().Value;
-                    return ActivatorUtilities.CreateInstance<BackgroundEventPublisherHostedService>(sp, options.NotificationWorkerCount);
-                })
-                .CreateChannel<ICommand>()
-                .CreateChannel<INotification>()
             ;
     }
+
+    /// <summary>
+    /// Adds mediator hosted services to the <see cref="IServiceCollection"/>.
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    public static IServiceCollection AddMediatorHostedServices(this IServiceCollection services)
+    {
+        return services
+            .AddSingleton<INotificationsChannel, NotificationsChannel>()
+            .AddSingleton<ICommandsChannel, CommandsChannel>()
+            .AddSingleton<IJobsChannel, JobsChannel>()
+            .AddSingleton<IJobQueue, JobQueue>()
+            .AddHostedService<JobRunnerHostedService>()
+            .AddHostedService(sp =>
+            {
+                var options = sp.GetRequiredService<IOptions<MediatorOptions>>().Value;
+                return ActivatorUtilities.CreateInstance<BackgroundCommandSenderHostedService>(sp, options.CommandWorkerCount);
+            })
+            .AddHostedService(sp =>
+            {
+                var options = sp.GetRequiredService<IOptions<MediatorOptions>>().Value;
+                return ActivatorUtilities.CreateInstance<BackgroundEventPublisherHostedService>(sp, options.NotificationWorkerCount);
+            });
+    }
     
     /// <summary>
     /// Adds a <see cref="Channel{T}"/> to the <see cref="IServiceCollection"/> and a hosted service that continuously reads from the channel and executes each received message.
@@ -193,16 +201,7 @@ public static class DependencyInjectionExtensions
     /// Registers all handlers from the specified assembly with the service container.
     /// </summary>
     public static IServiceCollection AddCommandHandlersFrom(this IServiceCollection services, Assembly assembly) => services.AddHandlersFromInternal<ICommandHandler>(assembly);
-
-    /// <summary>
-    /// Registers a channel for the specified type <c>T</c> as well as a channel reader and writer. 
-    /// </summary>
-    public static IServiceCollection CreateChannel<T>(this IServiceCollection services) =>
-        services
-            .AddSingleton(CreateChannel<T>())
-            .AddTransient(CreateChannelReader<T>)
-            .AddTransient(CreateChannelWriter<T>);
-
+    
     private static IServiceCollection AddHandlersFromInternal<TService, TMarker>(this IServiceCollection services) => services.AddHandlersFromInternal<TService>(typeof(TMarker));
     private static IServiceCollection AddHandlersFromInternal<TService>(this IServiceCollection services, Type assemblyMarkerType) => services.AddHandlersFromInternal<TService>(assemblyMarkerType.Assembly);
 
diff --git a/src/modules/Elsa.Common/Features/MediatorFeature.cs b/src/modules/Elsa.Common/Features/MediatorFeature.cs
index 6f1df8dc4..0aaf0ddaa 100644
--- a/src/modules/Elsa.Common/Features/MediatorFeature.cs
+++ b/src/modules/Elsa.Common/Features/MediatorFeature.cs
@@ -17,6 +17,8 @@ public class MediatorFeature : FeatureBase
     /// <inheritdoc />
     public override void Apply()
     {
-        Services.AddMediator();
+        Services
+            .AddMediator()
+            .AddMediatorHostedServices();
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Email/Elsa.Email.csproj b/src/modules/Elsa.Email/Elsa.Email.csproj
index f5cc8df58..9148370f0 100644
--- a/src/modules/Elsa.Email/Elsa.Email.csproj
+++ b/src/modules/Elsa.Email/Elsa.Email.csproj
@@ -17,7 +17,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Elsa.Mediator\Elsa.Mediator.csproj" />
         <ProjectReference Include="..\Elsa.Workflows.Core\Elsa.Workflows.Core.csproj" />
         <ProjectReference Include="..\Elsa.Workflows.Management\Elsa.Workflows.Management.csproj" />
     </ItemGroup>
diff --git a/src/modules/Elsa.Email/Models/EmailAttachment.cs b/src/modules/Elsa.Email/Models/EmailAttachment.cs
index ee5faef77..f30ab2bc5 100644
--- a/src/modules/Elsa.Email/Models/EmailAttachment.cs
+++ b/src/modules/Elsa.Email/Models/EmailAttachment.cs
@@ -1,3 +1,9 @@
 namespace Elsa.Email.Models;
 
+/// <summary>
+/// Represents an email attachment.
+/// </summary>
+/// <param name="Content">The content of the attachment.</param>
+/// <param name="FileName">The name of the attachment.</param>
+/// <param name="ContentType">The content type of the attachment.</param>
 public record EmailAttachment(object Content, string? FileName, string? ContentType);
\ No newline at end of file
diff --git a/src/modules/Elsa.Email/Options/SmtpEncryptionMethod.cs b/src/modules/Elsa.Email/Options/SmtpEncryptionMethod.cs
index 7b87fdf35..053b6af57 100644
--- a/src/modules/Elsa.Email/Options/SmtpEncryptionMethod.cs
+++ b/src/modules/Elsa.Email/Options/SmtpEncryptionMethod.cs
@@ -1,8 +1,22 @@
 namespace Elsa.Email.Options;
 
+/// <summary>
+/// Represents the encryption method to use when connecting to an SMTP server.
+/// </summary>
 public enum SmtpEncryptionMethod
 {
+    /// <summary>
+    /// No encryption.
+    /// </summary>
     None = 0,
+    
+    /// <summary>
+    /// SSL/TLS encryption.
+    /// </summary>
     SslTlS = 1,
+    
+    /// <summary>
+    /// STARTTLS encryption.
+    /// </summary>
     StartTls = 2
 }
\ No newline at end of file