diff --git a/src/clients/Elsa.Api.Client/Contracts/IApiHttpRequestConfigurator.cs b/src/clients/Elsa.Api.Client/Contracts/IApiHttpRequestConfigurator.cs
new file mode 100644
index 000000000..cdb295457
--- /dev/null
+++ b/src/clients/Elsa.Api.Client/Contracts/IApiHttpRequestConfigurator.cs
@@ -0,0 +1,12 @@
+namespace Elsa.Api.Client.Contracts;
+
+/// <summary>
+/// An interface for classes that can configure an HTTP request made to the API.
+/// </summary>
+public interface IApiHttpRequestConfigurator
+{
+    /// <summary>
+    /// Configures the HTTP request.
+    /// </summary>
+    Task ConfigureRequestAsync(HttpRequestMessage request, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/clients/Elsa.Api.Client/Extensions/DependencyInjectionExtensions.cs b/src/clients/Elsa.Api.Client/Extensions/DependencyInjectionExtensions.cs
index 182e1f315..525cbd5ca 100644
--- a/src/clients/Elsa.Api.Client/Extensions/DependencyInjectionExtensions.cs
+++ b/src/clients/Elsa.Api.Client/Extensions/DependencyInjectionExtensions.cs
@@ -2,6 +2,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using Elsa.Api.Client.Contracts;
 using Elsa.Api.Client.Converters;
+using Elsa.Api.Client.HttpMessageHandlers;
 using Elsa.Api.Client.Options;
 using Elsa.Api.Client.Resources.ActivityDescriptors.Contracts;
 using Elsa.Api.Client.Resources.ActivityExecutions.Contracts;
@@ -29,11 +30,11 @@ public static class DependencyInjectionExtensions
     /// <summary>
     /// Adds the Elsa client to the service collection.
     /// </summary>
-    public static IServiceCollection AddElsaClient(this IServiceCollection services, Action<ElsaClientOptions> configureOptions)
+    public static IServiceCollection AddElsaClient(this IServiceCollection services, Action<ElsaClientOptions>? configureOptions = default)
     {
-        services.Configure(configureOptions);
+        services.Configure(configureOptions ?? (_ => { }));
+        services.AddScoped<ApiHttpMessageHandler>();
         services.AddScoped<IElsaClient, ElsaClient>();
-        services.AddActivityTypeService();
 
         services.AddApi<IWorkflowDefinitionsApi>(CreateRefitSettings);
         services.AddApi<IWorkflowInstancesApi>(CreateRefitSettings);
@@ -46,14 +47,6 @@ public static class DependencyInjectionExtensions
         services.AddApi<IFeaturesApi>(CreateRefitSettings);
         return services;
     }
-
-    /// <summary>
-    /// Adds activity type services to the service collection.
-    /// </summary>
-    public static IServiceCollection AddActivityTypeService(this IServiceCollection services)
-    {
-        return services;
-    }
     
     /// <summary>
     /// Adds a refit client for the specified API type.
@@ -64,7 +57,16 @@ public static class DependencyInjectionExtensions
     public static void AddApi<T>(this IServiceCollection services, Func<IServiceProvider, RefitSettings> settings) where T : class
     {
         services.AddRefitClient<T>(settings)
-            .ConfigureHttpClient(ConfigureElsaApiHttpClient);
+            .ConfigureHttpClient(ConfigureElsaApiHttpClient)
+            .AddHttpMessageHandler<ApiHttpMessageHandler>();
+    }
+    
+    /// <summary>
+    /// Creates an API client for the specified API type.
+    /// </summary>
+    public static T CreateApi<T>(this IServiceProvider serviceProvider, Uri baseAddress) where T : class
+    {
+        return RestService.For<T>(baseAddress.ToString(), CreateRefitSettings(serviceProvider));
     }
 
     private static void ConfigureElsaApiHttpClient(IServiceProvider serviceProvider, HttpClient httpClient)
@@ -73,7 +75,10 @@ public static class DependencyInjectionExtensions
         httpClient.BaseAddress = options.BaseAddress;
         options.ConfigureHttpClient?.Invoke(serviceProvider, httpClient);
     }
-    
+
+    /// <summary>
+    /// Creates a <see cref="RefitSettings"/> instance configured for Elsa. 
+    /// </summary>
     private static RefitSettings CreateRefitSettings(IServiceProvider serviceProvider)
     {
         JsonSerializerOptions serializerOptions = new()
@@ -87,7 +92,7 @@ public static class DependencyInjectionExtensions
 
         var settings = new RefitSettings
         {
-            ContentSerializer = new SystemTextJsonContentSerializer(serializerOptions)
+            ContentSerializer = new SystemTextJsonContentSerializer(serializerOptions),
         };    
             
         return settings;
diff --git a/src/clients/Elsa.Api.Client/HttpMessageHandlers/ApiHttpMessageHandler.cs b/src/clients/Elsa.Api.Client/HttpMessageHandlers/ApiHttpMessageHandler.cs
new file mode 100644
index 000000000..a22a04f77
--- /dev/null
+++ b/src/clients/Elsa.Api.Client/HttpMessageHandlers/ApiHttpMessageHandler.cs
@@ -0,0 +1,28 @@
+using Elsa.Api.Client.Contracts;
+
+namespace Elsa.Api.Client.HttpMessageHandlers;
+
+/// <summary>
+/// An HTTP message handler that invokes <see cref="IApiHttpRequestConfigurator"/> instances before sending the request.
+/// </summary>
+public class ApiHttpMessageHandler : DelegatingHandler
+{
+    private readonly IEnumerable<IApiHttpRequestConfigurator> _httpClientConfigurators;
+
+    /// <inheritdoc />
+    public ApiHttpMessageHandler(IEnumerable<IApiHttpRequestConfigurator> httpClientConfigurators)
+    {
+        _httpClientConfigurators = httpClientConfigurators;
+    }
+
+    /// <inheritdoc />
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        // Invoke configurators.
+        foreach (var httpClientConfigurator in _httpClientConfigurators)
+            await httpClientConfigurator.ConfigureRequestAsync(request, cancellationToken);
+
+        // Continue processing the request
+        return await base.SendAsync(request, cancellationToken);
+    }
+}
\ No newline at end of file