diff --git a/src/activities/Elsa.Activities.AzureServiceBus/Activities/AzureServiceBusMessageReceived/AzureServiceBusQueueMessageReceived.cs b/src/activities/Elsa.Activities.AzureServiceBus/Activities/AzureServiceBusMessageReceived/AzureServiceBusQueueMessageReceived.cs
index 8d78fb524..14e324e8a 100644
--- a/src/activities/Elsa.Activities.AzureServiceBus/Activities/AzureServiceBusMessageReceived/AzureServiceBusQueueMessageReceived.cs
+++ b/src/activities/Elsa.Activities.AzureServiceBus/Activities/AzureServiceBusMessageReceived/AzureServiceBusQueueMessageReceived.cs
@@ -29,8 +29,6 @@ namespace Elsa.Activities.AzureServiceBus
         [ActivityOutput]
         public object? Output { get; set; }
         
-        
-
         protected override IActivityExecutionResult OnExecute(ActivityExecutionContext context) => context.WorkflowExecutionContext.IsFirstPass ? ExecuteInternal(context) : Suspend();
         protected override IActivityExecutionResult OnResume(ActivityExecutionContext context) => ExecuteInternal(context);
 
diff --git a/src/activities/Elsa.Activities.AzureServiceBus/Startup.cs b/src/activities/Elsa.Activities.AzureServiceBus/Startup.cs
index 0c1031867..11a55a18e 100644
--- a/src/activities/Elsa.Activities.AzureServiceBus/Startup.cs
+++ b/src/activities/Elsa.Activities.AzureServiceBus/Startup.cs
@@ -11,7 +11,7 @@ namespace Elsa.Activities.AzureServiceBus
     {
         public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
         {
-            var section = configuration.GetSection("Elsa:Azure:ServiceBus");
+            var section = configuration.GetSection("Elsa:Features:Azure:ServiceBus");
 
             elsa.AddAzureServiceBusActivities(options =>
             {
diff --git a/src/samples/server/Elsa.Samples.Server.Host/Models/SomeMessage.cs b/src/samples/server/Elsa.Samples.Server.Host/Models/SomeMessage.cs
new file mode 100644
index 000000000..fce9acaf3
--- /dev/null
+++ b/src/samples/server/Elsa.Samples.Server.Host/Models/SomeMessage.cs
@@ -0,0 +1,7 @@
+namespace Elsa.Samples.Server.Host.Models
+{
+    public class SomeMessage
+    {
+        public string Message { get; set; } = default!;
+    }
+}
\ No newline at end of file
diff --git a/src/samples/server/Elsa.Samples.Server.Host/Scripting/JavaScript/ConfigureJavaScriptEngine.cs b/src/samples/server/Elsa.Samples.Server.Host/Scripting/JavaScript/ConfigureJavaScriptEngine.cs
new file mode 100644
index 000000000..ccfe25eea
--- /dev/null
+++ b/src/samples/server/Elsa.Samples.Server.Host/Scripting/JavaScript/ConfigureJavaScriptEngine.cs
@@ -0,0 +1,20 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Elsa.Samples.Server.Host.Models;
+using Elsa.Scripting.JavaScript.Extensions;
+using Elsa.Scripting.JavaScript.Messages;
+using MediatR;
+
+namespace Elsa.Samples.Server.Host.Scripting.JavaScript
+{
+    public class ConfigureJavaScriptEngine : INotificationHandler<EvaluatingJavaScriptExpression>
+    {
+        public Task Handle(EvaluatingJavaScriptExpression notification, CancellationToken cancellationToken)
+        {
+            var engine = notification.Engine;
+            
+            engine.RegisterType<SomeMessage>();
+            return Task.CompletedTask;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
index fe4868a68..0c56f02d1 100644
--- a/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
+++ b/src/samples/server/Elsa.Samples.Server.Host/Startup.cs
@@ -88,6 +88,7 @@ namespace Elsa.Samples.Server.Host
             
             // Elsa API endpoints.
             services
+                .AddNotificationHandlersFrom<Startup>()
                 .AddElsaApiEndpoints()
                 .AddElsaSwagger();
 
diff --git a/src/samples/server/Elsa.Samples.Server.Host/appsettings.json b/src/samples/server/Elsa.Samples.Server.Host/appsettings.json
index f49981c47..604c892e9 100644
--- a/src/samples/server/Elsa.Samples.Server.Host/appsettings.json
+++ b/src/samples/server/Elsa.Samples.Server.Host/appsettings.json
@@ -15,7 +15,8 @@
         "SqlServer": "Server=localhost;Database=Elsa;Integrated Security=true;MultipleActiveResultSets=True;Max Pool Size=500;Connection Timeout=3600",
         "Sqlite": "Data Source=elsa.sqlite.db;Cache=Shared;",
         "MongoDb": "mongodb://localhost:27017/Elsa",
-        "PostgreSql": "Server=127.0.0.1;Port=5432;Database=elsa;User Id=postgres;Password=password;"
+        "PostgreSql": "Server=127.0.0.1;Port=5432;Database=elsa;User Id=postgres;Password=password;",
+        "AzureServiceBus": ""
     },
     "Elsa": {
         "Features": {
@@ -34,6 +35,12 @@
             "Conductor": true,
             "Telnyx": true,
             "File": true,
+            "Azure": {
+                "ServiceBus":{
+                    "Enabled": true,
+                    "ConnectionStringName": "AzureServiceBus"
+                }
+            },
             "Webhooks": {
                 "Enabled": true,
                 "Framework": "EntityFrameworkCore",