diff --git a/DigitalData.Core.Client/BaseHttpClientService.cs b/DigitalData.Core.Client/BaseHttpClientService.cs
index d9c8670..08300ef 100644
--- a/DigitalData.Core.Client/BaseHttpClientService.cs
+++ b/DigitalData.Core.Client/BaseHttpClientService.cs
@@ -19,7 +19,7 @@ namespace DigitalData.Core.Client
 
         protected IEnumerable<KeyValuePair<string, object?>>? _queryParams;
 
-        public BaseHttpClientService(HttpClient client, CookieContainer cookieContainer, HttpClientOptions clientOptions)
+        public BaseHttpClientService(HttpClient client, CookieContainer cookieContainer, IHttpClientOptions clientOptions)
         {
             _client = client;
             _cookies = cookieContainer;
diff --git a/DigitalData.Core.Client/DIExtensions.cs b/DigitalData.Core.Client/DIExtensions.cs
index f1aeff6..f44ea61 100644
--- a/DigitalData.Core.Client/DIExtensions.cs
+++ b/DigitalData.Core.Client/DIExtensions.cs
@@ -9,7 +9,7 @@ namespace DigitalData.Core.Client
     public static class DIExtensions
     {
         public static IServiceCollection AddHttpClientService<THttpClientOptions>(this IServiceCollection services, IConfigurationSection? section = null)
-            where THttpClientOptions : HttpClientOptions
+            where THttpClientOptions : class, IHttpClientOptions
         {
             services.TryAddSingleton<HttpClient>();
             services.TryAddSingleton<CookieContainer>();
diff --git a/DigitalData.Core.Client/HttpClientOptions.cs b/DigitalData.Core.Client/HttpClientOptions.cs
deleted file mode 100644
index da859e9..0000000
--- a/DigitalData.Core.Client/HttpClientOptions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using DigitalData.Core.Abstractions.Client;
-
-namespace DigitalData.Core.Client
-{
-    public class HttpClientOptions : IHttpClientOptions
-    {
-        public required string Uri { get; init; }
-
-        public string? Path { get; init; }
-
-        public IEnumerable<KeyValuePair<string, object>>? Headers { get; init; }
-
-        public IEnumerable<KeyValuePair<string, object?>>? QueryParams { get; init; }
-    }
-}
\ No newline at end of file
diff --git a/DigitalData.Core.Client/HttpClientService.cs b/DigitalData.Core.Client/HttpClientService.cs
index 5820d21..e007957 100644
--- a/DigitalData.Core.Client/HttpClientService.cs
+++ b/DigitalData.Core.Client/HttpClientService.cs
@@ -5,7 +5,7 @@ using System.Net;
 namespace DigitalData.Core.Client
 {
     public class HttpClientService<TClientOptions> : BaseHttpClientService, IHttpClientService<TClientOptions>, IBaseHttpClientService
-        where TClientOptions : HttpClientOptions
+        where TClientOptions : class, IHttpClientOptions
     {
         public HttpClientService(HttpClient client, CookieContainer cookieContainer, IOptions<TClientOptions> clientOptions) : base(client, cookieContainer, clientOptions.Value)
         {