diff --git a/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs b/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs
index dcbf45b..9906a90 100644
--- a/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs
+++ b/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs
@@ -12,11 +12,11 @@ namespace DigitalData.Core.Abstractions.Client
             string? scheme = null,
             int? port = null,
             string path = "",
-            Dictionary<string, object?>? queryParams = null,
+            IEnumerable<KeyValuePair<string, object?>>? queryParams = null,
             HttpMethod? method = null,
             HttpContent? body = null,
-            Dictionary<string, string>? form = null,
-            Dictionary<string, string>? headers = null,
+            IEnumerable<KeyValuePair<string, object>>? form = null,
+            IEnumerable<KeyValuePair<string, object>>? headers = null,
             bool sendWithCookie = true,
             bool saveCookie = true
         );
diff --git a/DigitalData.Core.Client/BaseHttpClientService.cs b/DigitalData.Core.Client/BaseHttpClientService.cs
index 9b6b2ac..7d08277 100644
--- a/DigitalData.Core.Client/BaseHttpClientService.cs
+++ b/DigitalData.Core.Client/BaseHttpClientService.cs
@@ -30,11 +30,11 @@ namespace DigitalData.Core.Client
             string? scheme = null,
             int? port = null,
             string path = "",
-            Dictionary<string, object?>? queryParams = null,
+            IEnumerable<KeyValuePair<string, object?>>? queryParams = null,
             HttpMethod? method = null,
             HttpContent? body = null,
-            Dictionary<string, string>? form = null,
-            Dictionary<string, string>? headers = null,
+            IEnumerable<KeyValuePair<string, object>>? form = null,
+            IEnumerable<KeyValuePair<string, object>>? headers = null,
             bool sendWithCookie = true,
             bool saveCookie = true
         )
@@ -76,7 +76,7 @@ namespace DigitalData.Core.Client
             var requestMessage = new HttpRequestMessage(method, requestUri);
 
             // Add headers if provided
-            headers?.ForEach(header => requestMessage.Headers.Add(header.Key, header.Value));
+            headers?.ForEach(header => requestMessage.Headers.Add(header.Key, header.Value.ToString()));
 
             // Add cookie to request
             if (sendWithCookie)
@@ -94,7 +94,7 @@ namespace DigitalData.Core.Client
             else if (body != null)
                 requestMessage.Content = body;
             else if (form != null)
-                requestMessage.Content = new FormUrlEncodedContent(form);
+                requestMessage.Content = new FormUrlEncodedContent(form.Select(e => KeyValuePair.Create(e.Key, e.Value.ToString())));
 
             var response = await _client.SendAsync(requestMessage);
 
diff --git a/DigitalData.Core.sln b/DigitalData.Core.sln
index f0b16c0..9191c29 100644
--- a/DigitalData.Core.sln
+++ b/DigitalData.Core.sln
@@ -53,8 +53,8 @@ Global
 		{0B051A5F-BD38-47D1-BAFF-D44BA30D3FB7}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{0B051A5F-BD38-47D1-BAFF-D44BA30D3FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B051A5F-BD38-47D1-BAFF-D44BA30D3FB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A80FFEC-9B83-40A7-8C78-124440B48B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A80FFEC-9B83-40A7-8C78-124440B48B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A80FFEC-9B83-40A7-8C78-124440B48B33}.Debug|Any CPU.ActiveCfg = Release|Any CPU
+		{6A80FFEC-9B83-40A7-8C78-124440B48B33}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{6A80FFEC-9B83-40A7-8C78-124440B48B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A80FFEC-9B83-40A7-8C78-124440B48B33}.Release|Any CPU.Build.0 = Release|Any CPU
 		{13E40DF1-6123-4838-9BF8-086C94E6ADF6}.Debug|Any CPU.ActiveCfg = Release|Any CPU