From 1778d446d1d7d478bd68b98a7edb54304fd62597 Mon Sep 17 00:00:00 2001
From: Boshi Lian <farmer1992@gmail.com>
Date: Sun, 19 Dec 2021 09:01:26 -0800
Subject: [PATCH] simplify http build code (#754)

* simplify request code

* re generate code

* remove unused tracing from websocket

* dotnet fmt

* fix warning

* fix warning

* make fmt and stylecop happy together
---
 gen/KubernetesGenerator/StringHelpers.cs      |    40 +-
 .../templates/Kubernetes.cs.template          |    47 +-
 src/KubernetesClient/Kubernetes.WebSocket.cs  |    82 +-
 src/KubernetesClient/Kubernetes.cs            |    50 +-
 src/KubernetesClient/generated/Kubernetes.cs  | 34302 +++++-----------
 5 files changed, 10156 insertions(+), 24365 deletions(-)

diff --git a/gen/KubernetesGenerator/StringHelpers.cs b/gen/KubernetesGenerator/StringHelpers.cs
index 9af9c9a..b8863a3 100644
--- a/gen/KubernetesGenerator/StringHelpers.cs
+++ b/gen/KubernetesGenerator/StringHelpers.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Security;
+using System.Text.RegularExpressions;
 using NJsonSchema;
 using Nustache.Core;
 
@@ -20,8 +21,8 @@ namespace KubernetesGenerator
         public void RegisterHelper()
         {
             Helpers.Register(nameof(ToXmlDoc), ToXmlDoc);
-            Helpers.Register(nameof(AddCurly), AddCurly);
-            Helpers.Register(nameof(EscapeDataString), EscapeDataString);
+            Helpers.Register(nameof(ToInterpolationPathString), ToInterpolationPathString);
+            Helpers.Register(nameof(IfGroupPathParamContainsGroup), IfGroupPathParamContainsGroup);
         }
 
         private void ToXmlDoc(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
@@ -90,42 +91,23 @@ namespace KubernetesGenerator
             }
         }
 
-        public void AddCurly(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        public void ToInterpolationPathString(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
-            var s = arguments?.FirstOrDefault() as string;
-            if (s != null)
+            var p = arguments?.FirstOrDefault() as string;
+            if (p != null)
             {
-                context.Write("{" + s + "}");
+                context.Write(Regex.Replace(p, "{(.+?)}", (m) => "{" + generalNameHelper.GetDotNetName(m.Groups[1].Value) + "}"));
             }
         }
 
-        public void EscapeDataString(RenderContext context, IList<object> arguments,
-            IDictionary<string, object> options,
+        public void IfGroupPathParamContainsGroup(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
-            var name = generalNameHelper.GetDotNetName(arguments[0] as string);
-            var type = arguments[1] as JsonObjectType?;
-
-            if (name == "pretty")
+            var p = arguments?.FirstOrDefault() as string;
+            if (p?.StartsWith("apis/{group}") == true)
             {
-                context.Write($"{name}.Value ? \"true\" : \"false\"");
-                return;
-            }
-
-            switch (type)
-            {
-                case JsonObjectType.String:
-                    context.Write($"System.Uri.EscapeDataString({name})");
-                    break;
-                case JsonObjectType.Boolean:
-                    context.Write($"{name}.Value ? \"true\" : \"false\"");
-                    break;
-                case JsonObjectType.Integer:
-                    context.Write($"{name}.Value");
-                    break;
-                default:
-                    throw new ArgumentException("type not supportted");
+                fn(null);
             }
         }
     }
diff --git a/gen/KubernetesGenerator/templates/Kubernetes.cs.template b/gen/KubernetesGenerator/templates/Kubernetes.cs.template
index e266a8e..e9ce1b9 100644
--- a/gen/KubernetesGenerator/templates/Kubernetes.cs.template
+++ b/gen/KubernetesGenerator/templates/Kubernetes.cs.template
@@ -46,42 +46,33 @@ namespace k8s
             {{/operation.parameters}}
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{{path}}").ToString();
-            {{#operation.parameters}}
-            {{#IfKindIs . "path"}}
-            _url = _url.Replace("{{AddCurly name}}", {{GetDotNetName name}});
-            {{/IfKindIs . "path"}}
-            {{/operation.parameters}}
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
+            var url = new System.Uri(BaseUri, $"{{ToInterpolationPathString path}}").ToString();
+            {{#IfGroupPathParamContainsGroup path}}
+            url = url.Replace("/apis//", "/api/");
+            {{/IfGroupPathParamContainsGroup}}
+            var q = new QueryBuilder();
             {{#operation.parameters}}
             {{#IfKindIs . "query"}}
-            if ({{GetDotNetName name}} != null)
-            {
-                _queryParameters.Add(string.Format("{{name}}={0}", {{EscapeDataString name type}}));
-            }
+            q.Append("{{name}}", {{GetDotNetName name}});
             {{/IfKindIs . "query"}}
             {{/operation.parameters}}
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.{{Method}}, customHeaders);
+            var httpRequest = CreateRequest(url, HttpMethod.{{Method}}, customHeaders);
             {{#IfParamContains operation "body"}}
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             {{/IfParamContains operation "body"}}
             {{#IfParamDoesNotContain operation "body"}}
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             {{/IfParamDoesNotContain operation "body"}}
             // Create Result
             {{#IfReturnType operation "void"}}
-            HttpOperationResponse _result = new HttpOperationResponse() { Request = _httpRequest, Response =  _httpResponse };
+            HttpOperationResponse result = new HttpOperationResponse() { Request = httpRequest, Response =  httpResponse };
             {{/IfReturnType operation "void"}}
             {{#IfReturnType operation "obj"}}
-            var _result = await CreateResultAsync{{GetReturnType operation "<>"}}(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync{{GetReturnType operation "<>"}}(httpRequest,
+                httpResponse,
                 {{#IfParamContains operation "watch"}}
                 watch,
                 {{/IfParamContains operation "watch"}}
@@ -91,12 +82,12 @@ namespace k8s
                 cancellationToken);
             {{/IfReturnType operation "obj"}}
             {{#IfReturnType operation "stream"}}
-            var _result = new HttpOperationResponse{{GetReturnType operation "<>"}}() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            var result = new HttpOperationResponse{{GetReturnType operation "<>"}}() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
             {{/IfReturnType operation "stream"}}
-            return _result;
+            return result;
         }
         {{/.}}
     }
diff --git a/src/KubernetesClient/Kubernetes.WebSocket.cs b/src/KubernetesClient/Kubernetes.WebSocket.cs
index 0bf3433..9b6909e 100644
--- a/src/KubernetesClient/Kubernetes.WebSocket.cs
+++ b/src/KubernetesClient/Kubernetes.WebSocket.cs
@@ -83,27 +83,6 @@ namespace k8s
                 }
             }
 
-            // Tracing
-            var shouldTrace = ServiceClientTracing.IsEnabled;
-            string invocationId = null;
-            if (shouldTrace)
-            {
-                invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                var tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("command", command);
-                tracingParameters.Add("container", container);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("namespace", @namespace);
-                tracingParameters.Add("stderr", stderr);
-                tracingParameters.Add("stdin", stdin);
-                tracingParameters.Add("stdout", stdout);
-                tracingParameters.Add("tty", tty);
-                tracingParameters.Add("webSocketSubProtol", webSocketSubProtol);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(invocationId, this, nameof(WebSocketNamespacedPodExecAsync),
-                    tracingParameters);
-            }
-
             // Construct URL
             var uriBuilder = new UriBuilder(BaseUri);
             uriBuilder.Scheme = BaseUri.Scheme == "https" ? "wss" : "ws";
@@ -137,7 +116,7 @@ namespace k8s
             uriBuilder.Query =
                 query.ToString(1, query.Length - 1); // UriBuilder.Query doesn't like leading '?' chars, so trim it
 
-            return StreamConnectAsync(uriBuilder.Uri, invocationId, webSocketSubProtol, customHeaders,
+            return StreamConnectAsync(uriBuilder.Uri, webSocketSubProtol, customHeaders,
                 cancellationToken);
         }
 
@@ -162,21 +141,6 @@ namespace k8s
                 throw new ArgumentNullException(nameof(ports));
             }
 
-            // Tracing
-            var shouldTrace = ServiceClientTracing.IsEnabled;
-            string invocationId = null;
-            if (shouldTrace)
-            {
-                invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                var tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("@namespace", @namespace);
-                tracingParameters.Add("ports", ports);
-                tracingParameters.Add("webSocketSubProtocol", webSocketSubProtocol);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(invocationId, this, nameof(WebSocketNamespacedPodPortForwardAsync),
-                    tracingParameters);
-            }
 
             // Construct URL
             var uriBuilder = new UriBuilder(BaseUri);
@@ -202,7 +166,7 @@ namespace k8s
 
             uriBuilder.Query = q.ToString();
 
-            return StreamConnectAsync(uriBuilder.Uri, invocationId, webSocketSubProtocol, customHeaders,
+            return StreamConnectAsync(uriBuilder.Uri, webSocketSubProtocol, customHeaders,
                 cancellationToken);
         }
 
@@ -222,26 +186,6 @@ namespace k8s
                 throw new ArgumentNullException(nameof(@namespace));
             }
 
-            // Tracing
-            var shouldTrace = ServiceClientTracing.IsEnabled;
-            string invocationId = null;
-            if (shouldTrace)
-            {
-                invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                var tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("container", container);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("namespace", @namespace);
-                tracingParameters.Add("stderr", stderr);
-                tracingParameters.Add("stdin", stdin);
-                tracingParameters.Add("stdout", stdout);
-                tracingParameters.Add("tty", tty);
-                tracingParameters.Add("webSocketSubProtol", webSocketSubProtol);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(invocationId, this, nameof(WebSocketNamespacedPodAttachAsync),
-                    tracingParameters);
-            }
-
             // Construct URL
             var uriBuilder = new UriBuilder(BaseUri);
             uriBuilder.Scheme = BaseUri.Scheme == "https" ? "wss" : "ws";
@@ -262,21 +206,17 @@ namespace k8s
             uriBuilder.Query =
                 query.ToString(1, query.Length - 1); // UriBuilder.Query doesn't like leading '?' chars, so trim it
 
-            return StreamConnectAsync(uriBuilder.Uri, invocationId, webSocketSubProtol, customHeaders,
+            return StreamConnectAsync(uriBuilder.Uri, webSocketSubProtol, customHeaders,
                 cancellationToken);
         }
 
-        protected async Task<WebSocket> StreamConnectAsync(Uri uri, string invocationId = null,
-            string webSocketSubProtocol = null, Dictionary<string, List<string>> customHeaders = null,
-            CancellationToken cancellationToken = default)
+        protected async Task<WebSocket> StreamConnectAsync(Uri uri, string webSocketSubProtocol = null, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default)
         {
             if (uri == null)
             {
                 throw new ArgumentNullException(nameof(uri));
             }
 
-            var shouldTrace = ServiceClientTracing.IsEnabled;
-
             // Create WebSocket transport objects
             var webSocketBuilder = CreateWebSocketBuilder();
 
@@ -387,22 +327,10 @@ namespace k8s
                     throw ex;
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                if (shouldTrace)
-                {
-                    ServiceClientTracing.Error(invocationId, ex);
-                }
-
                 throw;
             }
-            finally
-            {
-                if (shouldTrace)
-                {
-                    ServiceClientTracing.Exit(invocationId, null);
-                }
-            }
 
             return webSocket;
         }
diff --git a/src/KubernetesClient/Kubernetes.cs b/src/KubernetesClient/Kubernetes.cs
index d1fd466..ecd97d0 100644
--- a/src/KubernetesClient/Kubernetes.cs
+++ b/src/KubernetesClient/Kubernetes.cs
@@ -9,10 +9,20 @@ namespace k8s
 {
     public partial class Kubernetes
     {
+        private Uri baseuri;
+
         /// <summary>
         /// The base URI of the service.
         /// </summary>
-        public Uri BaseUri { get; set; }
+        public Uri BaseUri
+        {
+            get => baseuri;
+            set
+            {
+                var baseUrl = value?.AbsoluteUri ?? throw new ArgumentNullException(nameof(BaseUri));
+                baseuri = new Uri(baseUrl + (baseUrl.EndsWith("/") ? "" : "/"));
+            }
+        }
 
         /// <summary>
         /// Subscription credentials which uniquely identify client subscription.
@@ -132,6 +142,7 @@ namespace k8s
         /// <exception cref="ArgumentNullException">
         /// Thrown when a required parameter is null
         /// </exception>
+        [Obsolete]
         public Kubernetes(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient)
             : this(httpClient, disposeHttpClient)
         {
@@ -249,6 +260,43 @@ namespace k8s
             return result;
         }
 
+        private class QueryBuilder
+        {
+            private List<string> parameters = new List<string>();
+
+            public void Append(string key, params object[] values)
+            {
+                foreach (var value in values)
+                {
+                    switch (value)
+                    {
+                        case int intval:
+                            parameters.Add($"{key}={intval}");
+                            break;
+                        case string strval:
+                            parameters.Add($"{key}={Uri.EscapeDataString(strval)}");
+                            break;
+                        case bool boolval:
+                            parameters.Add($"{key}={(boolval ? "true" : "false")}");
+                            break;
+                        default:
+                            // null
+                            break;
+                    }
+                }
+            }
+
+            public override string ToString()
+            {
+                if (parameters.Count > 0)
+                {
+                    return "?" + string.Join("&", parameters);
+                }
+
+                return "";
+            }
+        }
+
         private HttpRequestMessage CreateRequest(string url, HttpMethod method, IDictionary<string, IList<string>> customHeaders)
         {
             var httpRequest = new HttpRequestMessage();
diff --git a/src/KubernetesClient/generated/Kubernetes.cs b/src/KubernetesClient/generated/Kubernetes.cs
index 1af4439..d7bf6c6 100644
--- a/src/KubernetesClient/generated/Kubernetes.cs
+++ b/src/KubernetesClient/generated/Kubernetes.cs
@@ -28,23 +28,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), ".well-known/openid-configuration/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $".well-known/openid-configuration/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<string>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<string>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIVersions>> GetAPIVersionsWithHttpMessagesAsync(
@@ -57,23 +53,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIVersions>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIVersions>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroupList>> GetAPIVersions1WithHttpMessagesAsync(
@@ -86,23 +78,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroupList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroupList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResourcesWithHttpMessagesAsync(
@@ -115,23 +103,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources1WithHttpMessagesAsync(
@@ -144,23 +128,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources2WithHttpMessagesAsync(
@@ -173,23 +153,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources3WithHttpMessagesAsync(
@@ -202,23 +178,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources4WithHttpMessagesAsync(
@@ -231,23 +203,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources5WithHttpMessagesAsync(
@@ -260,23 +228,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authentication.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authentication.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources6WithHttpMessagesAsync(
@@ -289,23 +253,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authorization.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authorization.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources7WithHttpMessagesAsync(
@@ -318,23 +278,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources8WithHttpMessagesAsync(
@@ -347,23 +303,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources9WithHttpMessagesAsync(
@@ -376,23 +328,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources10WithHttpMessagesAsync(
@@ -405,23 +353,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources11WithHttpMessagesAsync(
@@ -434,23 +378,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources12WithHttpMessagesAsync(
@@ -463,23 +403,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources13WithHttpMessagesAsync(
@@ -492,23 +428,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources14WithHttpMessagesAsync(
@@ -521,23 +453,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources15WithHttpMessagesAsync(
@@ -550,23 +478,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources16WithHttpMessagesAsync(
@@ -579,23 +503,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources17WithHttpMessagesAsync(
@@ -608,23 +528,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources18WithHttpMessagesAsync(
@@ -637,23 +553,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources19WithHttpMessagesAsync(
@@ -666,23 +578,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources20WithHttpMessagesAsync(
@@ -695,23 +603,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources21WithHttpMessagesAsync(
@@ -724,23 +628,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources22WithHttpMessagesAsync(
@@ -753,23 +653,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources23WithHttpMessagesAsync(
@@ -782,23 +678,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources24WithHttpMessagesAsync(
@@ -811,23 +703,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources25WithHttpMessagesAsync(
@@ -840,23 +728,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources26WithHttpMessagesAsync(
@@ -869,23 +753,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources27WithHttpMessagesAsync(
@@ -898,23 +778,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources28WithHttpMessagesAsync(
@@ -927,23 +803,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources29WithHttpMessagesAsync(
@@ -956,23 +828,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources30WithHttpMessagesAsync(
@@ -985,23 +853,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources31WithHttpMessagesAsync(
@@ -1014,23 +878,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIResourceList>> GetAPIResources32WithHttpMessagesAsync(
@@ -1043,23 +903,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIResourceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIResourceList>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ComponentStatusList>> ListComponentStatusWithHttpMessagesAsync(
@@ -1086,63 +942,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/componentstatuses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/componentstatuses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ComponentStatusList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ComponentStatusList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ComponentStatus>> ReadComponentStatusWithHttpMessagesAsync(
@@ -1161,28 +983,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/componentstatuses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/componentstatuses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ComponentStatus>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ComponentStatus>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ConfigMapList>> ListConfigMapForAllNamespacesWithHttpMessagesAsync(
@@ -1209,63 +1023,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/configmaps").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/configmaps").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ConfigMapList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ConfigMapList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointsList>> ListEndpointsForAllNamespacesWithHttpMessagesAsync(
@@ -1292,63 +1072,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/endpoints").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/endpoints").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointsList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointsList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Corev1EventList>> ListEventForAllNamespacesWithHttpMessagesAsync(
@@ -1375,63 +1121,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/events").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Corev1EventList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Corev1EventList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Eventsv1EventList>> ListEventForAllNamespaces1WithHttpMessagesAsync(
@@ -1458,63 +1170,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/events").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Eventsv1EventList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Eventsv1EventList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EventList>> ListEventForAllNamespaces2WithHttpMessagesAsync(
@@ -1541,63 +1219,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/events").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EventList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EventList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LimitRangeList>> ListLimitRangeForAllNamespacesWithHttpMessagesAsync(
@@ -1624,63 +1268,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/limitranges").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/limitranges").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LimitRangeList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LimitRangeList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NamespaceList>> ListNamespaceWithHttpMessagesAsync(
@@ -1707,63 +1317,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NamespaceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NamespaceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> CreateNamespaceWithHttpMessagesAsync(
@@ -1785,39 +1361,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Binding>> CreateNamespacedBindingWithHttpMessagesAsync(
@@ -1844,40 +1404,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/bindings").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/bindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Binding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Binding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedConfigMapWithHttpMessagesAsync(
@@ -1908,72 +1451,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ConfigMapList>> ListNamespacedConfigMapWithHttpMessagesAsync(
@@ -2005,64 +1507,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ConfigMapList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ConfigMapList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ConfigMap>> CreateNamespacedConfigMapWithHttpMessagesAsync(
@@ -2089,40 +1556,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ConfigMap>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ConfigMap>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedConfigMapWithHttpMessagesAsync(
@@ -2151,45 +1601,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ConfigMap>> ReadNamespacedConfigMapWithHttpMessagesAsync(
@@ -2213,29 +1642,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ConfigMap>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ConfigMap>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ConfigMap>> PatchNamespacedConfigMapWithHttpMessagesAsync(
@@ -2268,45 +1688,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ConfigMap>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ConfigMap>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ConfigMap>> ReplaceNamespacedConfigMapWithHttpMessagesAsync(
@@ -2338,41 +1737,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/configmaps/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/configmaps/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ConfigMap>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ConfigMap>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedEndpointsWithHttpMessagesAsync(
@@ -2403,72 +1784,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointsList>> ListNamespacedEndpointsWithHttpMessagesAsync(
@@ -2500,64 +1840,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointsList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointsList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Endpoints>> CreateNamespacedEndpointsWithHttpMessagesAsync(
@@ -2584,40 +1889,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Endpoints>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Endpoints>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedEndpointsWithHttpMessagesAsync(
@@ -2646,45 +1934,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Endpoints>> ReadNamespacedEndpointsWithHttpMessagesAsync(
@@ -2708,29 +1975,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Endpoints>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Endpoints>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Endpoints>> PatchNamespacedEndpointsWithHttpMessagesAsync(
@@ -2763,45 +2021,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Endpoints>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Endpoints>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Endpoints>> ReplaceNamespacedEndpointsWithHttpMessagesAsync(
@@ -2833,41 +2070,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/endpoints/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/endpoints/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Endpoints>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Endpoints>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedEventWithHttpMessagesAsync(
@@ -2898,72 +2117,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedEvent1WithHttpMessagesAsync(
@@ -2994,72 +2172,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedEvent2WithHttpMessagesAsync(
@@ -3090,72 +2227,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Corev1EventList>> ListNamespacedEventWithHttpMessagesAsync(
@@ -3187,64 +2283,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Corev1EventList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Corev1EventList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Eventsv1EventList>> ListNamespacedEvent1WithHttpMessagesAsync(
@@ -3276,64 +2337,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Eventsv1EventList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Eventsv1EventList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EventList>> ListNamespacedEvent2WithHttpMessagesAsync(
@@ -3365,64 +2391,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EventList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EventList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Corev1Event>> CreateNamespacedEventWithHttpMessagesAsync(
@@ -3449,40 +2440,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Corev1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Corev1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Eventsv1Event>> CreateNamespacedEvent1WithHttpMessagesAsync(
@@ -3509,40 +2483,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Eventsv1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Eventsv1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1Event>> CreateNamespacedEvent2WithHttpMessagesAsync(
@@ -3569,40 +2526,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedEventWithHttpMessagesAsync(
@@ -3631,45 +2571,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedEvent1WithHttpMessagesAsync(
@@ -3698,45 +2617,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedEvent2WithHttpMessagesAsync(
@@ -3765,45 +2663,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Corev1Event>> ReadNamespacedEventWithHttpMessagesAsync(
@@ -3827,29 +2704,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Corev1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Corev1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Eventsv1Event>> ReadNamespacedEvent1WithHttpMessagesAsync(
@@ -3873,29 +2741,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Eventsv1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Eventsv1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1Event>> ReadNamespacedEvent2WithHttpMessagesAsync(
@@ -3919,29 +2778,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Corev1Event>> PatchNamespacedEventWithHttpMessagesAsync(
@@ -3974,45 +2824,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Corev1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Corev1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Eventsv1Event>> PatchNamespacedEvent1WithHttpMessagesAsync(
@@ -4045,45 +2874,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Eventsv1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Eventsv1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1Event>> PatchNamespacedEvent2WithHttpMessagesAsync(
@@ -4116,45 +2924,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Corev1Event>> ReplaceNamespacedEventWithHttpMessagesAsync(
@@ -4186,41 +2973,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Corev1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Corev1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Eventsv1Event>> ReplaceNamespacedEvent1WithHttpMessagesAsync(
@@ -4252,41 +3021,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Eventsv1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Eventsv1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1Event>> ReplaceNamespacedEvent2WithHttpMessagesAsync(
@@ -4318,41 +3069,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/v1beta1/namespaces/{namespace}/events/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/v1beta1/namespaces/{namespaceParameter}/events/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1Event>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1Event>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4383,72 +3116,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LimitRangeList>> ListNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4480,64 +3172,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LimitRangeList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LimitRangeList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LimitRange>> CreateNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4564,40 +3221,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LimitRange>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LimitRange>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4626,45 +3266,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LimitRange>> ReadNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4688,29 +3307,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LimitRange>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LimitRange>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LimitRange>> PatchNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4743,45 +3353,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LimitRange>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LimitRange>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LimitRange>> ReplaceNamespacedLimitRangeWithHttpMessagesAsync(
@@ -4813,41 +3402,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/limitranges/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/limitranges/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LimitRange>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LimitRange>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -4878,72 +3449,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaimList>> ListNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -4975,64 +3505,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaimList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaimList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> CreateNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -5059,40 +3554,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> DeleteNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -5121,45 +3599,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> ReadNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -5183,29 +3640,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> PatchNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -5238,45 +3686,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> ReplaceNamespacedPersistentVolumeClaimWithHttpMessagesAsync(
@@ -5308,41 +3735,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> ReadNamespacedPersistentVolumeClaimStatusWithHttpMessagesAsync(
@@ -5366,29 +3775,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> PatchNamespacedPersistentVolumeClaimStatusWithHttpMessagesAsync(
@@ -5421,45 +3821,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaim>> ReplaceNamespacedPersistentVolumeClaimStatusWithHttpMessagesAsync(
@@ -5491,41 +3870,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/persistentvolumeclaims/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaim>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaim>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedPodWithHttpMessagesAsync(
@@ -5556,72 +3917,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodList>> ListNamespacedPodWithHttpMessagesAsync(
@@ -5653,64 +3973,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> CreateNamespacedPodWithHttpMessagesAsync(
@@ -5737,40 +4022,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> DeleteNamespacedPodWithHttpMessagesAsync(
@@ -5799,45 +4067,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> ReadNamespacedPodWithHttpMessagesAsync(
@@ -5861,29 +4108,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> PatchNamespacedPodWithHttpMessagesAsync(
@@ -5916,45 +4154,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> ReplaceNamespacedPodWithHttpMessagesAsync(
@@ -5986,41 +4203,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedPodAttachWithHttpMessagesAsync(
@@ -6048,45 +4247,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/attach").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (container != null)
-            {
-                _queryParameters.Add(string.Format("container={0}", System.Uri.EscapeDataString(container)));
-            }
-            if (stderr != null)
-            {
-                _queryParameters.Add(string.Format("stderr={0}", stderr.Value ? "true" : "false"));
-            }
-            if (stdin != null)
-            {
-                _queryParameters.Add(string.Format("stdin={0}", stdin.Value ? "true" : "false"));
-            }
-            if (stdout != null)
-            {
-                _queryParameters.Add(string.Format("stdout={0}", stdout.Value ? "true" : "false"));
-            }
-            if (tty != null)
-            {
-                _queryParameters.Add(string.Format("tty={0}", tty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/attach").ToString();
+            var q = new QueryBuilder();
+            q.Append("container", container);
+            q.Append("stderr", stderr);
+            q.Append("stdin", stdin);
+            q.Append("stdout", stdout);
+            q.Append("tty", tty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedPodAttachWithHttpMessagesAsync(
@@ -6114,45 +4292,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/attach").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (container != null)
-            {
-                _queryParameters.Add(string.Format("container={0}", System.Uri.EscapeDataString(container)));
-            }
-            if (stderr != null)
-            {
-                _queryParameters.Add(string.Format("stderr={0}", stderr.Value ? "true" : "false"));
-            }
-            if (stdin != null)
-            {
-                _queryParameters.Add(string.Format("stdin={0}", stdin.Value ? "true" : "false"));
-            }
-            if (stdout != null)
-            {
-                _queryParameters.Add(string.Format("stdout={0}", stdout.Value ? "true" : "false"));
-            }
-            if (tty != null)
-            {
-                _queryParameters.Add(string.Format("tty={0}", tty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/attach").ToString();
+            var q = new QueryBuilder();
+            q.Append("container", container);
+            q.Append("stderr", stderr);
+            q.Append("stdin", stdin);
+            q.Append("stdout", stdout);
+            q.Append("tty", tty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Binding>> CreateNamespacedPodBindingWithHttpMessagesAsync(
@@ -6184,41 +4341,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/binding").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/binding").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Binding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Binding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> ReadNamespacedPodEphemeralcontainersWithHttpMessagesAsync(
@@ -6242,29 +4381,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/ephemeralcontainers").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/ephemeralcontainers").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> PatchNamespacedPodEphemeralcontainersWithHttpMessagesAsync(
@@ -6297,45 +4427,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/ephemeralcontainers").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/ephemeralcontainers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> ReplaceNamespacedPodEphemeralcontainersWithHttpMessagesAsync(
@@ -6367,41 +4476,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/ephemeralcontainers").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/ephemeralcontainers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Eviction>> CreateNamespacedPodEvictionWithHttpMessagesAsync(
@@ -6433,41 +4524,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/eviction").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/eviction").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Eviction>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Eviction>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedPodExecWithHttpMessagesAsync(
@@ -6496,49 +4569,25 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/exec").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (command != null)
-            {
-                _queryParameters.Add(string.Format("command={0}", System.Uri.EscapeDataString(command)));
-            }
-            if (container != null)
-            {
-                _queryParameters.Add(string.Format("container={0}", System.Uri.EscapeDataString(container)));
-            }
-            if (stderr != null)
-            {
-                _queryParameters.Add(string.Format("stderr={0}", stderr.Value ? "true" : "false"));
-            }
-            if (stdin != null)
-            {
-                _queryParameters.Add(string.Format("stdin={0}", stdin.Value ? "true" : "false"));
-            }
-            if (stdout != null)
-            {
-                _queryParameters.Add(string.Format("stdout={0}", stdout.Value ? "true" : "false"));
-            }
-            if (tty != null)
-            {
-                _queryParameters.Add(string.Format("tty={0}", tty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/exec").ToString();
+            var q = new QueryBuilder();
+            q.Append("command", command);
+            q.Append("container", container);
+            q.Append("stderr", stderr);
+            q.Append("stdin", stdin);
+            q.Append("stdout", stdout);
+            q.Append("tty", tty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedPodExecWithHttpMessagesAsync(
@@ -6567,49 +4616,25 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/exec").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (command != null)
-            {
-                _queryParameters.Add(string.Format("command={0}", System.Uri.EscapeDataString(command)));
-            }
-            if (container != null)
-            {
-                _queryParameters.Add(string.Format("container={0}", System.Uri.EscapeDataString(container)));
-            }
-            if (stderr != null)
-            {
-                _queryParameters.Add(string.Format("stderr={0}", stderr.Value ? "true" : "false"));
-            }
-            if (stdin != null)
-            {
-                _queryParameters.Add(string.Format("stdin={0}", stdin.Value ? "true" : "false"));
-            }
-            if (stdout != null)
-            {
-                _queryParameters.Add(string.Format("stdout={0}", stdout.Value ? "true" : "false"));
-            }
-            if (tty != null)
-            {
-                _queryParameters.Add(string.Format("tty={0}", tty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/exec").ToString();
+            var q = new QueryBuilder();
+            q.Append("command", command);
+            q.Append("container", container);
+            q.Append("stderr", stderr);
+            q.Append("stdin", stdin);
+            q.Append("stdout", stdout);
+            q.Append("tty", tty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ReadNamespacedPodLogWithHttpMessagesAsync(
@@ -6641,61 +4666,28 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/log").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (container != null)
-            {
-                _queryParameters.Add(string.Format("container={0}", System.Uri.EscapeDataString(container)));
-            }
-            if (follow != null)
-            {
-                _queryParameters.Add(string.Format("follow={0}", follow.Value ? "true" : "false"));
-            }
-            if (insecureSkipTLSVerifyBackend != null)
-            {
-                _queryParameters.Add(string.Format("insecureSkipTLSVerifyBackend={0}", insecureSkipTLSVerifyBackend.Value ? "true" : "false"));
-            }
-            if (limitBytes != null)
-            {
-                _queryParameters.Add(string.Format("limitBytes={0}", limitBytes.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (previous != null)
-            {
-                _queryParameters.Add(string.Format("previous={0}", previous.Value ? "true" : "false"));
-            }
-            if (sinceSeconds != null)
-            {
-                _queryParameters.Add(string.Format("sinceSeconds={0}", sinceSeconds.Value));
-            }
-            if (tailLines != null)
-            {
-                _queryParameters.Add(string.Format("tailLines={0}", tailLines.Value));
-            }
-            if (timestamps != null)
-            {
-                _queryParameters.Add(string.Format("timestamps={0}", timestamps.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/log").ToString();
+            var q = new QueryBuilder();
+            q.Append("container", container);
+            q.Append("follow", follow);
+            q.Append("insecureSkipTLSVerifyBackend", insecureSkipTLSVerifyBackend);
+            q.Append("limitBytes", limitBytes);
+            q.Append("pretty", pretty);
+            q.Append("previous", previous);
+            q.Append("sinceSeconds", sinceSeconds);
+            q.Append("tailLines", tailLines);
+            q.Append("timestamps", timestamps);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedPodPortforwardWithHttpMessagesAsync(
@@ -6719,29 +4711,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/portforward").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (ports != null)
-            {
-                _queryParameters.Add(string.Format("ports={0}", ports.Value));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/portforward").ToString();
+            var q = new QueryBuilder();
+            q.Append("ports", ports);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedPodPortforwardWithHttpMessagesAsync(
@@ -6765,29 +4748,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/portforward").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (ports != null)
-            {
-                _queryParameters.Add(string.Format("ports={0}", ports.Value));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/portforward").ToString();
+            var q = new QueryBuilder();
+            q.Append("ports", ports);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectDeleteNamespacedPodProxyWithHttpMessagesAsync(
@@ -6811,29 +4785,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedPodProxyWithHttpMessagesAsync(
@@ -6857,29 +4822,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectHeadNamespacedPodProxyWithHttpMessagesAsync(
@@ -6903,29 +4859,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Head, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Head, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPatchNamespacedPodProxyWithHttpMessagesAsync(
@@ -6949,29 +4896,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedPodProxyWithHttpMessagesAsync(
@@ -6995,29 +4933,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPutNamespacedPodProxyWithHttpMessagesAsync(
@@ -7041,29 +4970,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectDeleteNamespacedPodProxyWithPathWithHttpMessagesAsync(
@@ -7092,30 +5012,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedPodProxyWithPathWithHttpMessagesAsync(
@@ -7144,30 +5054,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectHeadNamespacedPodProxyWithPathWithHttpMessagesAsync(
@@ -7196,30 +5096,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Head, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Head, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPatchNamespacedPodProxyWithPathWithHttpMessagesAsync(
@@ -7248,30 +5138,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedPodProxyWithPathWithHttpMessagesAsync(
@@ -7300,30 +5180,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPutNamespacedPodProxyWithPathWithHttpMessagesAsync(
@@ -7352,30 +5222,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> ReadNamespacedPodStatusWithHttpMessagesAsync(
@@ -7399,29 +5259,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> PatchNamespacedPodStatusWithHttpMessagesAsync(
@@ -7454,45 +5305,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Pod>> ReplaceNamespacedPodStatusWithHttpMessagesAsync(
@@ -7524,41 +5354,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/pods/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/pods/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Pod>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Pod>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedPodTemplateWithHttpMessagesAsync(
@@ -7589,72 +5401,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplateList>> ListNamespacedPodTemplateWithHttpMessagesAsync(
@@ -7686,64 +5457,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplateList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplateList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplate>> CreateNamespacedPodTemplateWithHttpMessagesAsync(
@@ -7770,40 +5506,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplate>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplate>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplate>> DeleteNamespacedPodTemplateWithHttpMessagesAsync(
@@ -7832,45 +5551,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplate>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplate>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplate>> ReadNamespacedPodTemplateWithHttpMessagesAsync(
@@ -7894,29 +5592,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplate>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplate>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplate>> PatchNamespacedPodTemplateWithHttpMessagesAsync(
@@ -7949,45 +5638,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplate>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplate>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplate>> ReplaceNamespacedPodTemplateWithHttpMessagesAsync(
@@ -8019,41 +5687,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/podtemplates/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/podtemplates/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplate>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplate>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8084,72 +5734,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationControllerList>> ListNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8181,64 +5790,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationControllerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationControllerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> CreateNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8265,40 +5839,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8327,45 +5884,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> ReadNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8389,29 +5925,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> PatchNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8444,45 +5971,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> ReplaceNamespacedReplicationControllerWithHttpMessagesAsync(
@@ -8514,41 +6020,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReadNamespacedReplicationControllerScaleWithHttpMessagesAsync(
@@ -8572,29 +6060,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> PatchNamespacedReplicationControllerScaleWithHttpMessagesAsync(
@@ -8627,45 +6106,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReplaceNamespacedReplicationControllerScaleWithHttpMessagesAsync(
@@ -8697,41 +6155,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> ReadNamespacedReplicationControllerStatusWithHttpMessagesAsync(
@@ -8755,29 +6195,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> PatchNamespacedReplicationControllerStatusWithHttpMessagesAsync(
@@ -8810,45 +6241,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationController>> ReplaceNamespacedReplicationControllerStatusWithHttpMessagesAsync(
@@ -8880,41 +6290,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/replicationcontrollers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/replicationcontrollers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationController>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationController>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -8945,72 +6337,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuotaList>> ListNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -9042,64 +6393,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuotaList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuotaList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> CreateNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -9126,40 +6442,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> DeleteNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -9188,45 +6487,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> ReadNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -9250,29 +6528,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> PatchNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -9305,45 +6574,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> ReplaceNamespacedResourceQuotaWithHttpMessagesAsync(
@@ -9375,41 +6623,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> ReadNamespacedResourceQuotaStatusWithHttpMessagesAsync(
@@ -9433,29 +6663,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> PatchNamespacedResourceQuotaStatusWithHttpMessagesAsync(
@@ -9488,45 +6709,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuota>> ReplaceNamespacedResourceQuotaStatusWithHttpMessagesAsync(
@@ -9558,41 +6758,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/resourcequotas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/resourcequotas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuota>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuota>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedSecretWithHttpMessagesAsync(
@@ -9623,72 +6805,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1SecretList>> ListNamespacedSecretWithHttpMessagesAsync(
@@ -9720,64 +6861,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1SecretList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1SecretList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Secret>> CreateNamespacedSecretWithHttpMessagesAsync(
@@ -9804,40 +6910,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Secret>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Secret>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedSecretWithHttpMessagesAsync(
@@ -9866,45 +6955,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Secret>> ReadNamespacedSecretWithHttpMessagesAsync(
@@ -9928,29 +6996,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Secret>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Secret>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Secret>> PatchNamespacedSecretWithHttpMessagesAsync(
@@ -9983,45 +7042,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Secret>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Secret>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Secret>> ReplaceNamespacedSecretWithHttpMessagesAsync(
@@ -10053,41 +7091,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/secrets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/secrets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Secret>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Secret>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10118,72 +7138,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccountList>> ListNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10215,64 +7194,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccountList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccountList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccount>> CreateNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10299,40 +7243,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccount>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccount>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccount>> DeleteNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10361,45 +7288,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccount>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccount>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccount>> ReadNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10423,29 +7329,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccount>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccount>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccount>> PatchNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10478,45 +7375,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccount>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccount>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccount>> ReplaceNamespacedServiceAccountWithHttpMessagesAsync(
@@ -10548,41 +7424,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccount>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccount>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Authenticationv1TokenRequest>> CreateNamespacedServiceAccountTokenWithHttpMessagesAsync(
@@ -10614,41 +7472,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/serviceaccounts/{name}/token").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/serviceaccounts/{name}/token").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<Authenticationv1TokenRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<Authenticationv1TokenRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedServiceWithHttpMessagesAsync(
@@ -10679,72 +7519,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceList>> ListNamespacedServiceWithHttpMessagesAsync(
@@ -10776,64 +7575,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> CreateNamespacedServiceWithHttpMessagesAsync(
@@ -10860,40 +7624,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> DeleteNamespacedServiceWithHttpMessagesAsync(
@@ -10922,45 +7669,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> ReadNamespacedServiceWithHttpMessagesAsync(
@@ -10984,29 +7710,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> PatchNamespacedServiceWithHttpMessagesAsync(
@@ -11039,45 +7756,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> ReplaceNamespacedServiceWithHttpMessagesAsync(
@@ -11109,41 +7805,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectDeleteNamespacedServiceProxyWithHttpMessagesAsync(
@@ -11167,29 +7845,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedServiceProxyWithHttpMessagesAsync(
@@ -11213,29 +7882,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectHeadNamespacedServiceProxyWithHttpMessagesAsync(
@@ -11259,29 +7919,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Head, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Head, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPatchNamespacedServiceProxyWithHttpMessagesAsync(
@@ -11305,29 +7956,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedServiceProxyWithHttpMessagesAsync(
@@ -11351,29 +7993,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPutNamespacedServiceProxyWithHttpMessagesAsync(
@@ -11397,29 +8030,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectDeleteNamespacedServiceProxyWithPathWithHttpMessagesAsync(
@@ -11448,30 +8072,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNamespacedServiceProxyWithPathWithHttpMessagesAsync(
@@ -11500,30 +8114,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectHeadNamespacedServiceProxyWithPathWithHttpMessagesAsync(
@@ -11552,30 +8156,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Head, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Head, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPatchNamespacedServiceProxyWithPathWithHttpMessagesAsync(
@@ -11604,30 +8198,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNamespacedServiceProxyWithPathWithHttpMessagesAsync(
@@ -11656,30 +8240,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPutNamespacedServiceProxyWithPathWithHttpMessagesAsync(
@@ -11708,30 +8282,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> ReadNamespacedServiceStatusWithHttpMessagesAsync(
@@ -11755,29 +8319,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> PatchNamespacedServiceStatusWithHttpMessagesAsync(
@@ -11810,45 +8365,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Service>> ReplaceNamespacedServiceStatusWithHttpMessagesAsync(
@@ -11880,41 +8414,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{namespace}/services/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{namespaceParameter}/services/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Service>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Service>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespaceWithHttpMessagesAsync(
@@ -11938,44 +8454,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> ReadNamespaceWithHttpMessagesAsync(
@@ -11994,28 +8490,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> PatchNamespaceWithHttpMessagesAsync(
@@ -12043,44 +8531,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> ReplaceNamespaceWithHttpMessagesAsync(
@@ -12107,40 +8575,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> ReplaceNamespaceFinalizeWithHttpMessagesAsync(
@@ -12167,40 +8618,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}/finalize").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}/finalize").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> ReadNamespaceStatusWithHttpMessagesAsync(
@@ -12219,28 +8653,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> PatchNamespaceStatusWithHttpMessagesAsync(
@@ -12268,44 +8694,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Namespace>> ReplaceNamespaceStatusWithHttpMessagesAsync(
@@ -12332,40 +8738,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/namespaces/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/namespaces/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Namespace>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Namespace>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNodeWithHttpMessagesAsync(
@@ -12391,71 +8780,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NodeList>> ListNodeWithHttpMessagesAsync(
@@ -12482,63 +8831,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NodeList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NodeList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> CreateNodeWithHttpMessagesAsync(
@@ -12560,39 +8875,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNodeWithHttpMessagesAsync(
@@ -12616,44 +8915,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> ReadNodeWithHttpMessagesAsync(
@@ -12672,28 +8951,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> PatchNodeWithHttpMessagesAsync(
@@ -12721,44 +8992,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> ReplaceNodeWithHttpMessagesAsync(
@@ -12785,40 +9036,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectDeleteNodeProxyWithHttpMessagesAsync(
@@ -12837,28 +9071,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNodeProxyWithHttpMessagesAsync(
@@ -12877,28 +9103,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectHeadNodeProxyWithHttpMessagesAsync(
@@ -12917,28 +9135,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Head, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Head, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPatchNodeProxyWithHttpMessagesAsync(
@@ -12957,28 +9167,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNodeProxyWithHttpMessagesAsync(
@@ -12997,28 +9199,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPutNodeProxyWithHttpMessagesAsync(
@@ -13037,28 +9231,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path != null)
-            {
-                _queryParameters.Add(string.Format("path={0}", System.Uri.EscapeDataString(path)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy").ToString();
+            var q = new QueryBuilder();
+            q.Append("path", path);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectDeleteNodeProxyWithPathWithHttpMessagesAsync(
@@ -13082,29 +9268,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectGetNodeProxyWithPathWithHttpMessagesAsync(
@@ -13128,29 +9305,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectHeadNodeProxyWithPathWithHttpMessagesAsync(
@@ -13174,29 +9342,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Head, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Head, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPatchNodeProxyWithPathWithHttpMessagesAsync(
@@ -13220,29 +9379,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPostNodeProxyWithPathWithHttpMessagesAsync(
@@ -13266,29 +9416,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<Stream>> ConnectPutNodeProxyWithPathWithHttpMessagesAsync(
@@ -13312,29 +9453,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/proxy/{path}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{path}", path);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (path1 != null)
-            {
-                _queryParameters.Add(string.Format("path1={0}", System.Uri.EscapeDataString(path1)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/proxy/{path}").ToString();
+            var q = new QueryBuilder();
+            q.Append("path1", path1);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = new HttpOperationResponse<Stream>() {
-                                Request = _httpRequest,
-                                Response = _httpResponse,
-                                Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
-            return _result;
+            var result = new HttpOperationResponse<Stream>() {
+                                Request = httpRequest,
+                                Response = httpResponse,
+                                Body = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false) };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> ReadNodeStatusWithHttpMessagesAsync(
@@ -13353,28 +9485,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> PatchNodeStatusWithHttpMessagesAsync(
@@ -13402,44 +9526,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Node>> ReplaceNodeStatusWithHttpMessagesAsync(
@@ -13466,40 +9570,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/nodes/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/nodes/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Node>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Node>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeClaimList>> ListPersistentVolumeClaimForAllNamespacesWithHttpMessagesAsync(
@@ -13526,63 +9613,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumeclaims").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumeclaims").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeClaimList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeClaimList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionPersistentVolumeWithHttpMessagesAsync(
@@ -13608,71 +9661,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolumeList>> ListPersistentVolumeWithHttpMessagesAsync(
@@ -13699,63 +9712,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolumeList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolumeList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> CreatePersistentVolumeWithHttpMessagesAsync(
@@ -13777,39 +9756,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> DeletePersistentVolumeWithHttpMessagesAsync(
@@ -13833,44 +9796,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> ReadPersistentVolumeWithHttpMessagesAsync(
@@ -13889,28 +9832,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> PatchPersistentVolumeWithHttpMessagesAsync(
@@ -13938,44 +9873,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> ReplacePersistentVolumeWithHttpMessagesAsync(
@@ -14002,40 +9917,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> ReadPersistentVolumeStatusWithHttpMessagesAsync(
@@ -14054,28 +9952,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> PatchPersistentVolumeStatusWithHttpMessagesAsync(
@@ -14103,44 +9993,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PersistentVolume>> ReplacePersistentVolumeStatusWithHttpMessagesAsync(
@@ -14167,40 +10037,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/persistentvolumes/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/persistentvolumes/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PersistentVolume>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PersistentVolume>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodList>> ListPodForAllNamespacesWithHttpMessagesAsync(
@@ -14227,63 +10080,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/pods").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/pods").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodTemplateList>> ListPodTemplateForAllNamespacesWithHttpMessagesAsync(
@@ -14310,63 +10129,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/podtemplates").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/podtemplates").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodTemplateList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodTemplateList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicationControllerList>> ListReplicationControllerForAllNamespacesWithHttpMessagesAsync(
@@ -14393,63 +10178,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/replicationcontrollers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/replicationcontrollers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicationControllerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicationControllerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ResourceQuotaList>> ListResourceQuotaForAllNamespacesWithHttpMessagesAsync(
@@ -14476,63 +10227,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/resourcequotas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/resourcequotas").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ResourceQuotaList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ResourceQuotaList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1SecretList>> ListSecretForAllNamespacesWithHttpMessagesAsync(
@@ -14559,63 +10276,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/secrets").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/secrets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1SecretList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1SecretList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceAccountList>> ListServiceAccountForAllNamespacesWithHttpMessagesAsync(
@@ -14642,63 +10325,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/serviceaccounts").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/serviceaccounts").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceAccountList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceAccountList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ServiceList>> ListServiceForAllNamespacesWithHttpMessagesAsync(
@@ -14725,63 +10374,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "api/v1/services").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"api/v1/services").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ServiceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ServiceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroupWithHttpMessagesAsync(
@@ -14794,23 +10409,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup1WithHttpMessagesAsync(
@@ -14823,23 +10434,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup2WithHttpMessagesAsync(
@@ -14852,23 +10459,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup3WithHttpMessagesAsync(
@@ -14881,23 +10484,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup4WithHttpMessagesAsync(
@@ -14910,23 +10509,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authentication.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authentication.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup5WithHttpMessagesAsync(
@@ -14939,23 +10534,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authorization.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authorization.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup6WithHttpMessagesAsync(
@@ -14968,23 +10559,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup7WithHttpMessagesAsync(
@@ -14997,23 +10584,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup8WithHttpMessagesAsync(
@@ -15026,23 +10609,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup9WithHttpMessagesAsync(
@@ -15055,23 +10634,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup10WithHttpMessagesAsync(
@@ -15084,23 +10659,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup11WithHttpMessagesAsync(
@@ -15113,23 +10684,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/events.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/events.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup12WithHttpMessagesAsync(
@@ -15142,23 +10709,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup13WithHttpMessagesAsync(
@@ -15171,23 +10734,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup14WithHttpMessagesAsync(
@@ -15200,23 +10759,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup15WithHttpMessagesAsync(
@@ -15229,23 +10784,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup16WithHttpMessagesAsync(
@@ -15258,23 +10809,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup17WithHttpMessagesAsync(
@@ -15287,23 +10834,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup18WithHttpMessagesAsync(
@@ -15316,23 +10859,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIGroup>> GetAPIGroup19WithHttpMessagesAsync(
@@ -15345,23 +10884,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIGroup>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIGroup>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15387,71 +10922,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1MutatingWebhookConfigurationList>> ListMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15478,63 +10973,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1MutatingWebhookConfigurationList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1MutatingWebhookConfigurationList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1MutatingWebhookConfiguration>> CreateMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15556,39 +11017,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1MutatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1MutatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15612,44 +11057,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1MutatingWebhookConfiguration>> ReadMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15668,28 +11093,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1MutatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1MutatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1MutatingWebhookConfiguration>> PatchMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15717,44 +11134,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1MutatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1MutatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1MutatingWebhookConfiguration>> ReplaceMutatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15781,40 +11178,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/mutatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1MutatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1MutatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15840,71 +11220,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ValidatingWebhookConfigurationList>> ListValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -15931,63 +11271,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ValidatingWebhookConfigurationList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ValidatingWebhookConfigurationList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ValidatingWebhookConfiguration>> CreateValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -16009,39 +11315,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -16065,44 +11355,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ValidatingWebhookConfiguration>> ReadValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -16121,28 +11391,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ValidatingWebhookConfiguration>> PatchValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -16170,44 +11432,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ValidatingWebhookConfiguration>> ReplaceValidatingWebhookConfigurationWithHttpMessagesAsync(
@@ -16234,40 +11476,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/admissionregistration.k8s.io/v1/validatingwebhookconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ValidatingWebhookConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16293,71 +11518,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinitionList>> ListCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16384,63 +11569,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinitionList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinitionList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> CreateCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16462,39 +11613,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16518,44 +11653,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> ReadCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16574,28 +11689,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> PatchCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16623,44 +11730,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> ReplaceCustomResourceDefinitionWithHttpMessagesAsync(
@@ -16687,40 +11774,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> ReadCustomResourceDefinitionStatusWithHttpMessagesAsync(
@@ -16739,28 +11809,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> PatchCustomResourceDefinitionStatusWithHttpMessagesAsync(
@@ -16788,44 +11850,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CustomResourceDefinition>> ReplaceCustomResourceDefinitionStatusWithHttpMessagesAsync(
@@ -16852,40 +11894,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiextensions.k8s.io/v1/customresourcedefinitions/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CustomResourceDefinition>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CustomResourceDefinition>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionAPIServiceWithHttpMessagesAsync(
@@ -16911,71 +11936,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIServiceList>> ListAPIServiceWithHttpMessagesAsync(
@@ -17002,63 +11987,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIServiceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIServiceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> CreateAPIServiceWithHttpMessagesAsync(
@@ -17080,39 +12031,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteAPIServiceWithHttpMessagesAsync(
@@ -17136,44 +12071,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> ReadAPIServiceWithHttpMessagesAsync(
@@ -17192,28 +12107,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> PatchAPIServiceWithHttpMessagesAsync(
@@ -17241,44 +12148,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> ReplaceAPIServiceWithHttpMessagesAsync(
@@ -17305,40 +12192,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> ReadAPIServiceStatusWithHttpMessagesAsync(
@@ -17357,28 +12227,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> PatchAPIServiceStatusWithHttpMessagesAsync(
@@ -17406,44 +12268,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1APIService>> ReplaceAPIServiceStatusWithHttpMessagesAsync(
@@ -17470,40 +12312,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apiregistration.k8s.io/v1/apiservices/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apiregistration.k8s.io/v1/apiservices/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1APIService>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1APIService>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ControllerRevisionList>> ListControllerRevisionForAllNamespacesWithHttpMessagesAsync(
@@ -17530,63 +12355,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/controllerrevisions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/controllerrevisions").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ControllerRevisionList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ControllerRevisionList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSetList>> ListDaemonSetForAllNamespacesWithHttpMessagesAsync(
@@ -17613,63 +12404,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/daemonsets").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/daemonsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DeploymentList>> ListDeploymentForAllNamespacesWithHttpMessagesAsync(
@@ -17696,63 +12453,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/deployments").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/deployments").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DeploymentList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DeploymentList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -17783,72 +12506,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ControllerRevisionList>> ListNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -17880,64 +12562,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ControllerRevisionList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ControllerRevisionList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ControllerRevision>> CreateNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -17964,40 +12611,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ControllerRevision>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ControllerRevision>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -18026,45 +12656,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ControllerRevision>> ReadNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -18088,29 +12697,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ControllerRevision>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ControllerRevision>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ControllerRevision>> PatchNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -18143,45 +12743,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ControllerRevision>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ControllerRevision>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ControllerRevision>> ReplaceNamespacedControllerRevisionWithHttpMessagesAsync(
@@ -18213,41 +12792,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/controllerrevisions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/controllerrevisions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ControllerRevision>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ControllerRevision>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18278,72 +12839,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSetList>> ListNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18375,64 +12895,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> CreateNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18459,40 +12944,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18521,45 +12989,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> ReadNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18583,29 +13030,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> PatchNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18638,45 +13076,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> ReplaceNamespacedDaemonSetWithHttpMessagesAsync(
@@ -18708,41 +13125,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> ReadNamespacedDaemonSetStatusWithHttpMessagesAsync(
@@ -18766,29 +13165,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> PatchNamespacedDaemonSetStatusWithHttpMessagesAsync(
@@ -18821,45 +13211,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DaemonSet>> ReplaceNamespacedDaemonSetStatusWithHttpMessagesAsync(
@@ -18891,41 +13260,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/daemonsets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/daemonsets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DaemonSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DaemonSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedDeploymentWithHttpMessagesAsync(
@@ -18956,72 +13307,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1DeploymentList>> ListNamespacedDeploymentWithHttpMessagesAsync(
@@ -19053,64 +13363,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1DeploymentList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1DeploymentList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> CreateNamespacedDeploymentWithHttpMessagesAsync(
@@ -19137,40 +13412,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedDeploymentWithHttpMessagesAsync(
@@ -19199,45 +13457,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> ReadNamespacedDeploymentWithHttpMessagesAsync(
@@ -19261,29 +13498,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> PatchNamespacedDeploymentWithHttpMessagesAsync(
@@ -19316,45 +13544,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> ReplaceNamespacedDeploymentWithHttpMessagesAsync(
@@ -19386,41 +13593,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReadNamespacedDeploymentScaleWithHttpMessagesAsync(
@@ -19444,29 +13633,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> PatchNamespacedDeploymentScaleWithHttpMessagesAsync(
@@ -19499,45 +13679,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReplaceNamespacedDeploymentScaleWithHttpMessagesAsync(
@@ -19569,41 +13728,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> ReadNamespacedDeploymentStatusWithHttpMessagesAsync(
@@ -19627,29 +13768,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> PatchNamespacedDeploymentStatusWithHttpMessagesAsync(
@@ -19682,45 +13814,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Deployment>> ReplaceNamespacedDeploymentStatusWithHttpMessagesAsync(
@@ -19752,41 +13863,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/deployments/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/deployments/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Deployment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Deployment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedReplicaSetWithHttpMessagesAsync(
@@ -19817,72 +13910,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSetList>> ListNamespacedReplicaSetWithHttpMessagesAsync(
@@ -19914,64 +13966,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> CreateNamespacedReplicaSetWithHttpMessagesAsync(
@@ -19998,40 +14015,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedReplicaSetWithHttpMessagesAsync(
@@ -20060,45 +14060,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> ReadNamespacedReplicaSetWithHttpMessagesAsync(
@@ -20122,29 +14101,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> PatchNamespacedReplicaSetWithHttpMessagesAsync(
@@ -20177,45 +14147,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> ReplaceNamespacedReplicaSetWithHttpMessagesAsync(
@@ -20247,41 +14196,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReadNamespacedReplicaSetScaleWithHttpMessagesAsync(
@@ -20305,29 +14236,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> PatchNamespacedReplicaSetScaleWithHttpMessagesAsync(
@@ -20360,45 +14282,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReplaceNamespacedReplicaSetScaleWithHttpMessagesAsync(
@@ -20430,41 +14331,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> ReadNamespacedReplicaSetStatusWithHttpMessagesAsync(
@@ -20488,29 +14371,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> PatchNamespacedReplicaSetStatusWithHttpMessagesAsync(
@@ -20543,45 +14417,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSet>> ReplaceNamespacedReplicaSetStatusWithHttpMessagesAsync(
@@ -20613,41 +14466,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/replicasets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/replicasets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedStatefulSetWithHttpMessagesAsync(
@@ -20678,72 +14513,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSetList>> ListNamespacedStatefulSetWithHttpMessagesAsync(
@@ -20775,64 +14569,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> CreateNamespacedStatefulSetWithHttpMessagesAsync(
@@ -20859,40 +14618,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedStatefulSetWithHttpMessagesAsync(
@@ -20921,45 +14663,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> ReadNamespacedStatefulSetWithHttpMessagesAsync(
@@ -20983,29 +14704,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> PatchNamespacedStatefulSetWithHttpMessagesAsync(
@@ -21038,45 +14750,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> ReplaceNamespacedStatefulSetWithHttpMessagesAsync(
@@ -21108,41 +14799,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReadNamespacedStatefulSetScaleWithHttpMessagesAsync(
@@ -21166,29 +14839,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> PatchNamespacedStatefulSetScaleWithHttpMessagesAsync(
@@ -21221,45 +14885,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Scale>> ReplaceNamespacedStatefulSetScaleWithHttpMessagesAsync(
@@ -21291,41 +14934,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}/scale").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}/scale").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Scale>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Scale>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> ReadNamespacedStatefulSetStatusWithHttpMessagesAsync(
@@ -21349,29 +14974,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> PatchNamespacedStatefulSetStatusWithHttpMessagesAsync(
@@ -21404,45 +15020,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSet>> ReplaceNamespacedStatefulSetStatusWithHttpMessagesAsync(
@@ -21474,41 +15069,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/namespaces/{namespace}/statefulsets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/namespaces/{namespaceParameter}/statefulsets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSet>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSet>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ReplicaSetList>> ListReplicaSetForAllNamespacesWithHttpMessagesAsync(
@@ -21535,63 +15112,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/replicasets").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/replicasets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ReplicaSetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ReplicaSetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StatefulSetList>> ListStatefulSetForAllNamespacesWithHttpMessagesAsync(
@@ -21618,63 +15161,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/apps/v1/statefulsets").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/apps/v1/statefulsets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StatefulSetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StatefulSetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1TokenReview>> CreateTokenReviewWithHttpMessagesAsync(
@@ -21696,39 +15205,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authentication.k8s.io/v1/tokenreviews").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authentication.k8s.io/v1/tokenreviews").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1TokenReview>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1TokenReview>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LocalSubjectAccessReview>> CreateNamespacedLocalSubjectAccessReviewWithHttpMessagesAsync(
@@ -21755,40 +15248,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authorization.k8s.io/v1/namespaces/{namespace}/localsubjectaccessreviews").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authorization.k8s.io/v1/namespaces/{namespaceParameter}/localsubjectaccessreviews").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LocalSubjectAccessReview>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LocalSubjectAccessReview>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1SelfSubjectAccessReview>> CreateSelfSubjectAccessReviewWithHttpMessagesAsync(
@@ -21810,39 +15286,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authorization.k8s.io/v1/selfsubjectaccessreviews").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authorization.k8s.io/v1/selfsubjectaccessreviews").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1SelfSubjectAccessReview>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1SelfSubjectAccessReview>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1SelfSubjectRulesReview>> CreateSelfSubjectRulesReviewWithHttpMessagesAsync(
@@ -21864,39 +15324,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authorization.k8s.io/v1/selfsubjectrulesreviews").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authorization.k8s.io/v1/selfsubjectrulesreviews").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1SelfSubjectRulesReview>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1SelfSubjectRulesReview>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1SubjectAccessReview>> CreateSubjectAccessReviewWithHttpMessagesAsync(
@@ -21918,39 +15362,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/authorization.k8s.io/v1/subjectaccessreviews").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/authorization.k8s.io/v1/subjectaccessreviews").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1SubjectAccessReview>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1SubjectAccessReview>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscalerList>> ListHorizontalPodAutoscalerForAllNamespacesWithHttpMessagesAsync(
@@ -21977,63 +15405,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscalerList>> ListHorizontalPodAutoscalerForAllNamespaces1WithHttpMessagesAsync(
@@ -22060,63 +15454,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscalerList>> ListHorizontalPodAutoscalerForAllNamespaces2WithHttpMessagesAsync(
@@ -22143,63 +15503,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscalerList>> ListHorizontalPodAutoscalerForAllNamespaces3WithHttpMessagesAsync(
@@ -22226,63 +15552,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -22313,72 +15605,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -22409,72 +15660,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -22505,72 +15715,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -22601,72 +15770,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscalerList>> ListNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -22698,64 +15826,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscalerList>> ListNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -22787,64 +15880,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscalerList>> ListNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -22876,64 +15934,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscalerList>> ListNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -22965,64 +15988,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscalerList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscalerList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> CreateNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -23049,40 +16037,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> CreateNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -23109,40 +16080,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> CreateNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -23169,40 +16123,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> CreateNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -23229,40 +16166,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -23291,45 +16211,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -23358,45 +16257,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -23425,45 +16303,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -23492,45 +16349,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -23554,29 +16390,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -23600,29 +16427,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -23646,29 +16464,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -23692,29 +16501,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -23747,45 +16547,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -23818,45 +16597,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -23889,45 +16647,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -23960,45 +16697,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscalerWithHttpMessagesAsync(
@@ -24030,41 +16746,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscaler1WithHttpMessagesAsync(
@@ -24096,41 +16794,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscaler2WithHttpMessagesAsync(
@@ -24162,41 +16842,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscaler3WithHttpMessagesAsync(
@@ -24228,41 +16890,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscalerStatusWithHttpMessagesAsync(
@@ -24286,29 +16930,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscalerStatus1WithHttpMessagesAsync(
@@ -24332,29 +16967,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscalerStatus2WithHttpMessagesAsync(
@@ -24378,29 +17004,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> ReadNamespacedHorizontalPodAutoscalerStatus3WithHttpMessagesAsync(
@@ -24424,29 +17041,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscalerStatusWithHttpMessagesAsync(
@@ -24479,45 +17087,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscalerStatus1WithHttpMessagesAsync(
@@ -24550,45 +17137,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscalerStatus2WithHttpMessagesAsync(
@@ -24621,45 +17187,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> PatchNamespacedHorizontalPodAutoscalerStatus3WithHttpMessagesAsync(
@@ -24692,45 +17237,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscalerStatusWithHttpMessagesAsync(
@@ -24762,41 +17286,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscalerStatus1WithHttpMessagesAsync(
@@ -24828,41 +17334,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta1HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscalerStatus2WithHttpMessagesAsync(
@@ -24894,41 +17382,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta1/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta1HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V2beta2HorizontalPodAutoscaler>> ReplaceNamespacedHorizontalPodAutoscalerStatus3WithHttpMessagesAsync(
@@ -24960,41 +17430,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/autoscaling/v2beta2/namespaces/{namespace}/horizontalpodautoscalers/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/autoscaling/v2beta2/namespaces/{namespaceParameter}/horizontalpodautoscalers/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V2beta2HorizontalPodAutoscaler>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJobList>> ListCronJobForAllNamespacesWithHttpMessagesAsync(
@@ -25021,63 +17473,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/cronjobs").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJobList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJobList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJobList>> ListCronJobForAllNamespaces1WithHttpMessagesAsync(
@@ -25104,63 +17522,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/cronjobs").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJobList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJobList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1JobList>> ListJobForAllNamespacesWithHttpMessagesAsync(
@@ -25187,63 +17571,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/jobs").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/jobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1JobList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1JobList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedCronJobWithHttpMessagesAsync(
@@ -25274,72 +17624,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedCronJob1WithHttpMessagesAsync(
@@ -25370,72 +17679,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJobList>> ListNamespacedCronJobWithHttpMessagesAsync(
@@ -25467,64 +17735,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJobList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJobList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJobList>> ListNamespacedCronJob1WithHttpMessagesAsync(
@@ -25556,64 +17789,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJobList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJobList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> CreateNamespacedCronJobWithHttpMessagesAsync(
@@ -25640,40 +17838,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> CreateNamespacedCronJob1WithHttpMessagesAsync(
@@ -25700,40 +17881,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedCronJobWithHttpMessagesAsync(
@@ -25762,45 +17926,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedCronJob1WithHttpMessagesAsync(
@@ -25829,45 +17972,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> ReadNamespacedCronJobWithHttpMessagesAsync(
@@ -25891,29 +18013,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> ReadNamespacedCronJob1WithHttpMessagesAsync(
@@ -25937,29 +18050,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> PatchNamespacedCronJobWithHttpMessagesAsync(
@@ -25992,45 +18096,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> PatchNamespacedCronJob1WithHttpMessagesAsync(
@@ -26063,45 +18146,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> ReplaceNamespacedCronJobWithHttpMessagesAsync(
@@ -26133,41 +18195,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> ReplaceNamespacedCronJob1WithHttpMessagesAsync(
@@ -26199,41 +18243,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> ReadNamespacedCronJobStatusWithHttpMessagesAsync(
@@ -26257,29 +18283,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> ReadNamespacedCronJobStatus1WithHttpMessagesAsync(
@@ -26303,29 +18320,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> PatchNamespacedCronJobStatusWithHttpMessagesAsync(
@@ -26358,45 +18366,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> PatchNamespacedCronJobStatus1WithHttpMessagesAsync(
@@ -26429,45 +18416,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CronJob>> ReplaceNamespacedCronJobStatusWithHttpMessagesAsync(
@@ -26499,41 +18465,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/cronjobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/cronjobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CronJob>> ReplaceNamespacedCronJobStatus1WithHttpMessagesAsync(
@@ -26565,41 +18513,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1beta1/namespaces/{namespace}/cronjobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1beta1/namespaces/{namespaceParameter}/cronjobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CronJob>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CronJob>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedJobWithHttpMessagesAsync(
@@ -26630,72 +18560,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1JobList>> ListNamespacedJobWithHttpMessagesAsync(
@@ -26727,64 +18616,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1JobList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1JobList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> CreateNamespacedJobWithHttpMessagesAsync(
@@ -26811,40 +18665,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedJobWithHttpMessagesAsync(
@@ -26873,45 +18710,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> ReadNamespacedJobWithHttpMessagesAsync(
@@ -26935,29 +18751,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> PatchNamespacedJobWithHttpMessagesAsync(
@@ -26990,45 +18797,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> ReplaceNamespacedJobWithHttpMessagesAsync(
@@ -27060,41 +18846,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> ReadNamespacedJobStatusWithHttpMessagesAsync(
@@ -27118,29 +18886,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> PatchNamespacedJobStatusWithHttpMessagesAsync(
@@ -27173,45 +18932,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Job>> ReplaceNamespacedJobStatusWithHttpMessagesAsync(
@@ -27243,41 +18981,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/batch/v1/namespaces/{namespace}/jobs/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/batch/v1/namespaces/{namespaceParameter}/jobs/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Job>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Job>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionCertificateSigningRequestWithHttpMessagesAsync(
@@ -27303,71 +19023,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequestList>> ListCertificateSigningRequestWithHttpMessagesAsync(
@@ -27394,63 +19074,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequestList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequestList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> CreateCertificateSigningRequestWithHttpMessagesAsync(
@@ -27472,39 +19118,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCertificateSigningRequestWithHttpMessagesAsync(
@@ -27528,44 +19158,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> ReadCertificateSigningRequestWithHttpMessagesAsync(
@@ -27584,28 +19194,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> PatchCertificateSigningRequestWithHttpMessagesAsync(
@@ -27633,44 +19235,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> ReplaceCertificateSigningRequestWithHttpMessagesAsync(
@@ -27697,40 +19279,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> ReadCertificateSigningRequestApprovalWithHttpMessagesAsync(
@@ -27749,28 +19314,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/approval").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/approval").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> PatchCertificateSigningRequestApprovalWithHttpMessagesAsync(
@@ -27798,44 +19355,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/approval").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/approval").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> ReplaceCertificateSigningRequestApprovalWithHttpMessagesAsync(
@@ -27862,40 +19399,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/approval").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/approval").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> ReadCertificateSigningRequestStatusWithHttpMessagesAsync(
@@ -27914,28 +19434,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> PatchCertificateSigningRequestStatusWithHttpMessagesAsync(
@@ -27963,44 +19475,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CertificateSigningRequest>> ReplaceCertificateSigningRequestStatusWithHttpMessagesAsync(
@@ -28027,40 +19519,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/certificates.k8s.io/v1/certificatesigningrequests/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CertificateSigningRequest>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CertificateSigningRequest>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LeaseList>> ListLeaseForAllNamespacesWithHttpMessagesAsync(
@@ -28087,63 +19562,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/leases").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/leases").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LeaseList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LeaseList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedLeaseWithHttpMessagesAsync(
@@ -28174,72 +19615,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1LeaseList>> ListNamespacedLeaseWithHttpMessagesAsync(
@@ -28271,64 +19671,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1LeaseList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1LeaseList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Lease>> CreateNamespacedLeaseWithHttpMessagesAsync(
@@ -28355,40 +19720,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Lease>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Lease>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedLeaseWithHttpMessagesAsync(
@@ -28417,45 +19765,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Lease>> ReadNamespacedLeaseWithHttpMessagesAsync(
@@ -28479,29 +19806,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Lease>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Lease>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Lease>> PatchNamespacedLeaseWithHttpMessagesAsync(
@@ -28534,45 +19852,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Lease>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Lease>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Lease>> ReplaceNamespacedLeaseWithHttpMessagesAsync(
@@ -28604,41 +19901,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/coordination.k8s.io/v1/namespaces/{namespace}/leases/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/coordination.k8s.io/v1/namespaces/{namespaceParameter}/leases/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Lease>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Lease>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointSliceList>> ListEndpointSliceForAllNamespacesWithHttpMessagesAsync(
@@ -28665,63 +19944,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/endpointslices").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointSliceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointSliceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EndpointSliceList>> ListEndpointSliceForAllNamespaces1WithHttpMessagesAsync(
@@ -28748,63 +19993,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/endpointslices").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EndpointSliceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EndpointSliceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -28835,72 +20046,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -28931,72 +20101,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointSliceList>> ListNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -29028,64 +20157,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointSliceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointSliceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EndpointSliceList>> ListNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -29117,64 +20211,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EndpointSliceList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EndpointSliceList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointSlice>> CreateNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -29201,40 +20260,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EndpointSlice>> CreateNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -29261,40 +20303,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -29323,45 +20348,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -29390,45 +20394,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointSlice>> ReadNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -29452,29 +20435,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EndpointSlice>> ReadNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -29498,29 +20472,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointSlice>> PatchNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -29553,45 +20518,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EndpointSlice>> PatchNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -29624,45 +20568,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1EndpointSlice>> ReplaceNamespacedEndpointSliceWithHttpMessagesAsync(
@@ -29694,41 +20617,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1EndpointSlice>> ReplaceNamespacedEndpointSlice1WithHttpMessagesAsync(
@@ -29760,41 +20665,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/discovery.k8s.io/v1beta1/namespaces/{namespace}/endpointslices/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/discovery.k8s.io/v1beta1/namespaces/{namespaceParameter}/endpointslices/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1EndpointSlice>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1EndpointSlice>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionFlowSchemaWithHttpMessagesAsync(
@@ -29820,71 +20707,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionFlowSchema1WithHttpMessagesAsync(
@@ -29910,71 +20757,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchemaList>> ListFlowSchemaWithHttpMessagesAsync(
@@ -30001,63 +20808,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchemaList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchemaList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchemaList>> ListFlowSchema1WithHttpMessagesAsync(
@@ -30084,63 +20857,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchemaList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchemaList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> CreateFlowSchemaWithHttpMessagesAsync(
@@ -30162,39 +20901,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> CreateFlowSchema1WithHttpMessagesAsync(
@@ -30216,39 +20939,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteFlowSchemaWithHttpMessagesAsync(
@@ -30272,44 +20979,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteFlowSchema1WithHttpMessagesAsync(
@@ -30333,44 +21020,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> ReadFlowSchemaWithHttpMessagesAsync(
@@ -30389,28 +21056,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> ReadFlowSchema1WithHttpMessagesAsync(
@@ -30429,28 +21088,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> PatchFlowSchemaWithHttpMessagesAsync(
@@ -30478,44 +21129,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> PatchFlowSchema1WithHttpMessagesAsync(
@@ -30543,44 +21174,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> ReplaceFlowSchemaWithHttpMessagesAsync(
@@ -30607,40 +21218,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> ReplaceFlowSchema1WithHttpMessagesAsync(
@@ -30667,40 +21261,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> ReadFlowSchemaStatusWithHttpMessagesAsync(
@@ -30719,28 +21296,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> ReadFlowSchemaStatus1WithHttpMessagesAsync(
@@ -30759,28 +21328,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> PatchFlowSchemaStatusWithHttpMessagesAsync(
@@ -30808,44 +21369,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> PatchFlowSchemaStatus1WithHttpMessagesAsync(
@@ -30873,44 +21414,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1FlowSchema>> ReplaceFlowSchemaStatusWithHttpMessagesAsync(
@@ -30937,40 +21458,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/flowschemas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2FlowSchema>> ReplaceFlowSchemaStatus1WithHttpMessagesAsync(
@@ -30997,40 +21501,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/flowschemas/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2FlowSchema>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2FlowSchema>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionPriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31056,71 +21543,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionPriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31146,71 +21593,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfigurationList>> ListPriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31237,63 +21644,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfigurationList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfigurationList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfigurationList>> ListPriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31320,63 +21693,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfigurationList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfigurationList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> CreatePriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31398,39 +21737,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> CreatePriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31452,39 +21775,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeletePriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31508,44 +21815,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeletePriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31569,44 +21856,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> ReadPriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31625,28 +21892,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> ReadPriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31665,28 +21924,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> PatchPriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31714,44 +21965,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> PatchPriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31779,44 +22010,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> ReplacePriorityLevelConfigurationWithHttpMessagesAsync(
@@ -31843,40 +22054,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> ReplacePriorityLevelConfiguration1WithHttpMessagesAsync(
@@ -31903,40 +22097,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> ReadPriorityLevelConfigurationStatusWithHttpMessagesAsync(
@@ -31955,28 +22132,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> ReadPriorityLevelConfigurationStatus1WithHttpMessagesAsync(
@@ -31995,28 +22164,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> PatchPriorityLevelConfigurationStatusWithHttpMessagesAsync(
@@ -32044,44 +22205,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> PatchPriorityLevelConfigurationStatus1WithHttpMessagesAsync(
@@ -32109,44 +22250,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PriorityLevelConfiguration>> ReplacePriorityLevelConfigurationStatusWithHttpMessagesAsync(
@@ -32173,40 +22294,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta1/prioritylevelconfigurations/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta2PriorityLevelConfiguration>> ReplacePriorityLevelConfigurationStatus1WithHttpMessagesAsync(
@@ -32233,40 +22337,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/flowcontrol.apiserver.k8s.io/v1beta2/prioritylevelconfigurations/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta2PriorityLevelConfiguration>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionStorageVersionWithHttpMessagesAsync(
@@ -32292,71 +22379,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersionList>> ListStorageVersionWithHttpMessagesAsync(
@@ -32383,63 +22430,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersionList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersionList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> CreateStorageVersionWithHttpMessagesAsync(
@@ -32461,39 +22474,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteStorageVersionWithHttpMessagesAsync(
@@ -32517,44 +22514,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> ReadStorageVersionWithHttpMessagesAsync(
@@ -32573,28 +22550,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> PatchStorageVersionWithHttpMessagesAsync(
@@ -32622,44 +22591,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> ReplaceStorageVersionWithHttpMessagesAsync(
@@ -32686,40 +22635,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> ReadStorageVersionStatusWithHttpMessagesAsync(
@@ -32738,28 +22670,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> PatchStorageVersionStatusWithHttpMessagesAsync(
@@ -32787,44 +22711,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1StorageVersion>> ReplaceStorageVersionStatusWithHttpMessagesAsync(
@@ -32851,40 +22755,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/internal.apiserver.k8s.io/v1alpha1/storageversions/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1StorageVersion>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1StorageVersion>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionIngressClassWithHttpMessagesAsync(
@@ -32910,71 +22797,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressClassList>> ListIngressClassWithHttpMessagesAsync(
@@ -33001,63 +22848,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressClassList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressClassList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressClass>> CreateIngressClassWithHttpMessagesAsync(
@@ -33079,39 +22892,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteIngressClassWithHttpMessagesAsync(
@@ -33135,44 +22932,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressClass>> ReadIngressClassWithHttpMessagesAsync(
@@ -33191,28 +22968,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressClass>> PatchIngressClassWithHttpMessagesAsync(
@@ -33240,44 +23009,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressClass>> ReplaceIngressClassWithHttpMessagesAsync(
@@ -33304,40 +23053,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingressclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressList>> ListIngressForAllNamespacesWithHttpMessagesAsync(
@@ -33364,63 +23096,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/ingresses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/ingresses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedIngressWithHttpMessagesAsync(
@@ -33451,72 +23149,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1IngressList>> ListNamespacedIngressWithHttpMessagesAsync(
@@ -33548,64 +23205,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1IngressList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1IngressList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> CreateNamespacedIngressWithHttpMessagesAsync(
@@ -33632,40 +23254,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedIngressWithHttpMessagesAsync(
@@ -33694,45 +23299,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> ReadNamespacedIngressWithHttpMessagesAsync(
@@ -33756,29 +23340,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> PatchNamespacedIngressWithHttpMessagesAsync(
@@ -33811,45 +23386,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> ReplaceNamespacedIngressWithHttpMessagesAsync(
@@ -33881,41 +23435,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> ReadNamespacedIngressStatusWithHttpMessagesAsync(
@@ -33939,29 +23475,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> PatchNamespacedIngressStatusWithHttpMessagesAsync(
@@ -33994,45 +23521,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Ingress>> ReplaceNamespacedIngressStatusWithHttpMessagesAsync(
@@ -34064,41 +23570,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/ingresses/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/ingresses/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Ingress>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Ingress>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34129,72 +23617,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NetworkPolicyList>> ListNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34226,64 +23673,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NetworkPolicyList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NetworkPolicyList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NetworkPolicy>> CreateNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34310,40 +23722,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NetworkPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NetworkPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34372,45 +23767,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NetworkPolicy>> ReadNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34434,29 +23808,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NetworkPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NetworkPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NetworkPolicy>> PatchNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34489,45 +23854,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NetworkPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NetworkPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NetworkPolicy>> ReplaceNamespacedNetworkPolicyWithHttpMessagesAsync(
@@ -34559,41 +23903,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/namespaces/{namespace}/networkpolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/namespaces/{namespaceParameter}/networkpolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NetworkPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NetworkPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1NetworkPolicyList>> ListNetworkPolicyForAllNamespacesWithHttpMessagesAsync(
@@ -34620,63 +23946,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/networking.k8s.io/v1/networkpolicies").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/networking.k8s.io/v1/networkpolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1NetworkPolicyList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1NetworkPolicyList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionRuntimeClassWithHttpMessagesAsync(
@@ -34702,71 +23994,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionRuntimeClass1WithHttpMessagesAsync(
@@ -34792,71 +24044,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionRuntimeClass2WithHttpMessagesAsync(
@@ -34882,71 +24094,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RuntimeClassList>> ListRuntimeClassWithHttpMessagesAsync(
@@ -34973,63 +24145,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RuntimeClassList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RuntimeClassList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1RuntimeClassList>> ListRuntimeClass1WithHttpMessagesAsync(
@@ -35056,63 +24194,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1RuntimeClassList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1RuntimeClassList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1RuntimeClassList>> ListRuntimeClass2WithHttpMessagesAsync(
@@ -35139,63 +24243,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1RuntimeClassList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1RuntimeClassList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RuntimeClass>> CreateRuntimeClassWithHttpMessagesAsync(
@@ -35217,39 +24287,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1RuntimeClass>> CreateRuntimeClass1WithHttpMessagesAsync(
@@ -35271,39 +24325,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1RuntimeClass>> CreateRuntimeClass2WithHttpMessagesAsync(
@@ -35325,39 +24363,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteRuntimeClassWithHttpMessagesAsync(
@@ -35381,44 +24403,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteRuntimeClass1WithHttpMessagesAsync(
@@ -35442,44 +24444,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteRuntimeClass2WithHttpMessagesAsync(
@@ -35503,44 +24485,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RuntimeClass>> ReadRuntimeClassWithHttpMessagesAsync(
@@ -35559,28 +24521,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1RuntimeClass>> ReadRuntimeClass1WithHttpMessagesAsync(
@@ -35599,28 +24553,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1RuntimeClass>> ReadRuntimeClass2WithHttpMessagesAsync(
@@ -35639,28 +24585,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RuntimeClass>> PatchRuntimeClassWithHttpMessagesAsync(
@@ -35688,44 +24626,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1RuntimeClass>> PatchRuntimeClass1WithHttpMessagesAsync(
@@ -35753,44 +24671,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1RuntimeClass>> PatchRuntimeClass2WithHttpMessagesAsync(
@@ -35818,44 +24716,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RuntimeClass>> ReplaceRuntimeClassWithHttpMessagesAsync(
@@ -35882,40 +24760,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1RuntimeClass>> ReplaceRuntimeClass1WithHttpMessagesAsync(
@@ -35942,40 +24803,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1alpha1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1RuntimeClass>> ReplaceRuntimeClass2WithHttpMessagesAsync(
@@ -36002,40 +24846,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/node.k8s.io/v1beta1/runtimeclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1RuntimeClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1RuntimeClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36066,72 +24893,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36162,72 +24948,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudgetList>> ListNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36259,64 +25004,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudgetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudgetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudgetList>> ListNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36348,64 +25058,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudgetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudgetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> CreateNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36432,40 +25107,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> CreateNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36492,40 +25150,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36554,45 +25195,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36621,45 +25241,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> ReadNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36683,29 +25282,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> ReadNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36729,29 +25319,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> PatchNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36784,45 +25365,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> PatchNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36855,45 +25415,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> ReplaceNamespacedPodDisruptionBudgetWithHttpMessagesAsync(
@@ -36925,41 +25464,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> ReplaceNamespacedPodDisruptionBudget1WithHttpMessagesAsync(
@@ -36991,41 +25512,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> ReadNamespacedPodDisruptionBudgetStatusWithHttpMessagesAsync(
@@ -37049,29 +25552,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> ReadNamespacedPodDisruptionBudgetStatus1WithHttpMessagesAsync(
@@ -37095,29 +25589,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> PatchNamespacedPodDisruptionBudgetStatusWithHttpMessagesAsync(
@@ -37150,45 +25635,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> PatchNamespacedPodDisruptionBudgetStatus1WithHttpMessagesAsync(
@@ -37221,45 +25685,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudget>> ReplaceNamespacedPodDisruptionBudgetStatusWithHttpMessagesAsync(
@@ -37291,41 +25734,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/namespaces/{namespace}/poddisruptionbudgets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudget>> ReplaceNamespacedPodDisruptionBudgetStatus1WithHttpMessagesAsync(
@@ -37357,41 +25782,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/namespaces/{namespace}/poddisruptionbudgets/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/namespaces/{namespaceParameter}/poddisruptionbudgets/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudget>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudget>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PodDisruptionBudgetList>> ListPodDisruptionBudgetForAllNamespacesWithHttpMessagesAsync(
@@ -37418,63 +25825,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1/poddisruptionbudgets").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PodDisruptionBudgetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PodDisruptionBudgetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodDisruptionBudgetList>> ListPodDisruptionBudgetForAllNamespaces1WithHttpMessagesAsync(
@@ -37501,63 +25874,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/poddisruptionbudgets").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/poddisruptionbudgets").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodDisruptionBudgetList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodDisruptionBudgetList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionPodSecurityPolicyWithHttpMessagesAsync(
@@ -37583,71 +25922,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodSecurityPolicyList>> ListPodSecurityPolicyWithHttpMessagesAsync(
@@ -37674,63 +25973,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodSecurityPolicyList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodSecurityPolicyList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodSecurityPolicy>> CreatePodSecurityPolicyWithHttpMessagesAsync(
@@ -37752,39 +26017,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodSecurityPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodSecurityPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodSecurityPolicy>> DeletePodSecurityPolicyWithHttpMessagesAsync(
@@ -37808,44 +26057,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodSecurityPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodSecurityPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodSecurityPolicy>> ReadPodSecurityPolicyWithHttpMessagesAsync(
@@ -37864,28 +26093,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodSecurityPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodSecurityPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodSecurityPolicy>> PatchPodSecurityPolicyWithHttpMessagesAsync(
@@ -37913,44 +26134,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodSecurityPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodSecurityPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1PodSecurityPolicy>> ReplacePodSecurityPolicyWithHttpMessagesAsync(
@@ -37977,40 +26178,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/policy/v1beta1/podsecuritypolicies/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1PodSecurityPolicy>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1PodSecurityPolicy>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionClusterRoleBindingWithHttpMessagesAsync(
@@ -38036,71 +26220,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRoleBindingList>> ListClusterRoleBindingWithHttpMessagesAsync(
@@ -38127,63 +26271,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRoleBindingList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRoleBindingList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRoleBinding>> CreateClusterRoleBindingWithHttpMessagesAsync(
@@ -38205,39 +26315,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteClusterRoleBindingWithHttpMessagesAsync(
@@ -38261,44 +26355,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRoleBinding>> ReadClusterRoleBindingWithHttpMessagesAsync(
@@ -38317,28 +26391,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRoleBinding>> PatchClusterRoleBindingWithHttpMessagesAsync(
@@ -38366,44 +26432,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRoleBinding>> ReplaceClusterRoleBindingWithHttpMessagesAsync(
@@ -38430,40 +26476,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterrolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionClusterRoleWithHttpMessagesAsync(
@@ -38489,71 +26518,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRoleList>> ListClusterRoleWithHttpMessagesAsync(
@@ -38580,63 +26569,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRoleList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRoleList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRole>> CreateClusterRoleWithHttpMessagesAsync(
@@ -38658,39 +26613,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRole>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRole>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteClusterRoleWithHttpMessagesAsync(
@@ -38714,44 +26653,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRole>> ReadClusterRoleWithHttpMessagesAsync(
@@ -38770,28 +26689,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRole>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRole>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRole>> PatchClusterRoleWithHttpMessagesAsync(
@@ -38819,44 +26730,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRole>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRole>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1ClusterRole>> ReplaceClusterRoleWithHttpMessagesAsync(
@@ -38883,40 +26774,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/clusterroles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1ClusterRole>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1ClusterRole>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedRoleBindingWithHttpMessagesAsync(
@@ -38947,72 +26821,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleBindingList>> ListNamespacedRoleBindingWithHttpMessagesAsync(
@@ -39044,64 +26877,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleBindingList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleBindingList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleBinding>> CreateNamespacedRoleBindingWithHttpMessagesAsync(
@@ -39128,40 +26926,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedRoleBindingWithHttpMessagesAsync(
@@ -39190,45 +26971,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleBinding>> ReadNamespacedRoleBindingWithHttpMessagesAsync(
@@ -39252,29 +27012,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleBinding>> PatchNamespacedRoleBindingWithHttpMessagesAsync(
@@ -39307,45 +27058,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleBinding>> ReplaceNamespacedRoleBindingWithHttpMessagesAsync(
@@ -39377,41 +27107,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/rolebindings/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/rolebindings/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleBinding>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleBinding>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedRoleWithHttpMessagesAsync(
@@ -39442,72 +27154,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleList>> ListNamespacedRoleWithHttpMessagesAsync(
@@ -39539,64 +27210,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Role>> CreateNamespacedRoleWithHttpMessagesAsync(
@@ -39623,40 +27259,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Role>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Role>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedRoleWithHttpMessagesAsync(
@@ -39685,45 +27304,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Role>> ReadNamespacedRoleWithHttpMessagesAsync(
@@ -39747,29 +27345,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Role>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Role>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Role>> PatchNamespacedRoleWithHttpMessagesAsync(
@@ -39802,45 +27391,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Role>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Role>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Role>> ReplaceNamespacedRoleWithHttpMessagesAsync(
@@ -39872,41 +27440,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/namespaces/{namespace}/roles/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/namespaces/{namespaceParameter}/roles/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Role>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Role>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleBindingList>> ListRoleBindingForAllNamespacesWithHttpMessagesAsync(
@@ -39933,63 +27483,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/rolebindings").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/rolebindings").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleBindingList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleBindingList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1RoleList>> ListRoleForAllNamespacesWithHttpMessagesAsync(
@@ -40016,63 +27532,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/rbac.authorization.k8s.io/v1/roles").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/rbac.authorization.k8s.io/v1/roles").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1RoleList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1RoleList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionPriorityClassWithHttpMessagesAsync(
@@ -40098,71 +27580,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PriorityClassList>> ListPriorityClassWithHttpMessagesAsync(
@@ -40189,63 +27631,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PriorityClassList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PriorityClassList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PriorityClass>> CreatePriorityClassWithHttpMessagesAsync(
@@ -40267,39 +27675,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PriorityClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PriorityClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeletePriorityClassWithHttpMessagesAsync(
@@ -40323,44 +27715,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PriorityClass>> ReadPriorityClassWithHttpMessagesAsync(
@@ -40379,28 +27751,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PriorityClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PriorityClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PriorityClass>> PatchPriorityClassWithHttpMessagesAsync(
@@ -40428,44 +27792,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PriorityClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PriorityClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1PriorityClass>> ReplacePriorityClassWithHttpMessagesAsync(
@@ -40492,40 +27836,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/scheduling.k8s.io/v1/priorityclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1PriorityClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1PriorityClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionCSIDriverWithHttpMessagesAsync(
@@ -40551,71 +27878,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSIDriverList>> ListCSIDriverWithHttpMessagesAsync(
@@ -40642,63 +27929,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSIDriverList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSIDriverList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSIDriver>> CreateCSIDriverWithHttpMessagesAsync(
@@ -40720,39 +27973,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSIDriver>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSIDriver>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSIDriver>> DeleteCSIDriverWithHttpMessagesAsync(
@@ -40776,44 +28013,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSIDriver>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSIDriver>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSIDriver>> ReadCSIDriverWithHttpMessagesAsync(
@@ -40832,28 +28049,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSIDriver>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSIDriver>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSIDriver>> PatchCSIDriverWithHttpMessagesAsync(
@@ -40881,44 +28090,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSIDriver>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSIDriver>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSIDriver>> ReplaceCSIDriverWithHttpMessagesAsync(
@@ -40945,40 +28134,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csidrivers/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSIDriver>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSIDriver>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionCSINodeWithHttpMessagesAsync(
@@ -41004,71 +28176,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSINodeList>> ListCSINodeWithHttpMessagesAsync(
@@ -41095,63 +28227,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSINodeList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSINodeList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSINode>> CreateCSINodeWithHttpMessagesAsync(
@@ -41173,39 +28271,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSINode>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSINode>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSINode>> DeleteCSINodeWithHttpMessagesAsync(
@@ -41229,44 +28311,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSINode>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSINode>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSINode>> ReadCSINodeWithHttpMessagesAsync(
@@ -41285,28 +28347,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSINode>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSINode>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSINode>> PatchCSINodeWithHttpMessagesAsync(
@@ -41334,44 +28388,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSINode>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSINode>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1CSINode>> ReplaceCSINodeWithHttpMessagesAsync(
@@ -41398,40 +28432,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/csinodes/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/csinodes/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1CSINode>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1CSINode>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionStorageClassWithHttpMessagesAsync(
@@ -41457,71 +28474,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StorageClassList>> ListStorageClassWithHttpMessagesAsync(
@@ -41548,63 +28525,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StorageClassList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StorageClassList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StorageClass>> CreateStorageClassWithHttpMessagesAsync(
@@ -41626,39 +28569,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StorageClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StorageClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StorageClass>> DeleteStorageClassWithHttpMessagesAsync(
@@ -41682,44 +28609,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StorageClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StorageClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StorageClass>> ReadStorageClassWithHttpMessagesAsync(
@@ -41738,28 +28645,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StorageClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StorageClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StorageClass>> PatchStorageClassWithHttpMessagesAsync(
@@ -41787,44 +28686,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StorageClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StorageClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1StorageClass>> ReplaceStorageClassWithHttpMessagesAsync(
@@ -41851,40 +28730,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/storageclasses/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1StorageClass>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1StorageClass>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionVolumeAttachmentWithHttpMessagesAsync(
@@ -41910,71 +28772,31 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachmentList>> ListVolumeAttachmentWithHttpMessagesAsync(
@@ -42001,63 +28823,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachmentList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachmentList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> CreateVolumeAttachmentWithHttpMessagesAsync(
@@ -42079,39 +28867,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> DeleteVolumeAttachmentWithHttpMessagesAsync(
@@ -42135,44 +28907,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> ReadVolumeAttachmentWithHttpMessagesAsync(
@@ -42191,28 +28943,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> PatchVolumeAttachmentWithHttpMessagesAsync(
@@ -42240,44 +28984,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> ReplaceVolumeAttachmentWithHttpMessagesAsync(
@@ -42304,40 +29028,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> ReadVolumeAttachmentStatusWithHttpMessagesAsync(
@@ -42356,28 +29063,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> PatchVolumeAttachmentStatusWithHttpMessagesAsync(
@@ -42405,44 +29104,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1VolumeAttachment>> ReplaceVolumeAttachmentStatusWithHttpMessagesAsync(
@@ -42469,40 +29148,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1/volumeattachments/{name}/status").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1/volumeattachments/{name}/status").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1VolumeAttachment>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1VolumeAttachment>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1CSIStorageCapacityList>> ListCSIStorageCapacityForAllNamespacesWithHttpMessagesAsync(
@@ -42529,63 +29191,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/csistoragecapacities").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1CSIStorageCapacityList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1CSIStorageCapacityList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CSIStorageCapacityList>> ListCSIStorageCapacityForAllNamespaces1WithHttpMessagesAsync(
@@ -42612,63 +29240,29 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/csistoragecapacities").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("pretty", pretty);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CSIStorageCapacityList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CSIStorageCapacityList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -42699,72 +29293,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteCollectionNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -42795,72 +29348,31 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("continue", continueParameter);
+            q.Append("dryRun", dryRun);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1CSIStorageCapacityList>> ListNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -42892,64 +29404,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1CSIStorageCapacityList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1CSIStorageCapacityList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CSIStorageCapacityList>> ListNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -42981,64 +29458,29 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CSIStorageCapacityList>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CSIStorageCapacityList>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1CSIStorageCapacity>> CreateNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -43065,40 +29507,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CSIStorageCapacity>> CreateNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -43125,40 +29550,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities").ToString();
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -43187,45 +29595,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1Status>> DeleteNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -43254,45 +29641,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1Status>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1Status>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1CSIStorageCapacity>> ReadNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -43316,29 +29682,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CSIStorageCapacity>> ReadNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -43362,29 +29719,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1CSIStorageCapacity>> PatchNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -43417,45 +29765,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CSIStorageCapacity>> PatchNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -43488,45 +29815,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("force", force);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1alpha1CSIStorageCapacity>> ReplaceNamespacedCSIStorageCapacityWithHttpMessagesAsync(
@@ -43558,41 +29864,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1alpha1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1alpha1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1alpha1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<V1beta1CSIStorageCapacity>> ReplaceNamespacedCSIStorageCapacity1WithHttpMessagesAsync(
@@ -43624,41 +29912,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/storage.k8s.io/v1beta1/namespaces/{namespace}/csistoragecapacities/{name}").ToString();
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (fieldValidation != null)
-            {
-                _queryParameters.Add(string.Format("fieldValidation={0}", System.Uri.EscapeDataString(fieldValidation)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/storage.k8s.io/v1beta1/namespaces/{namespaceParameter}/csistoragecapacities/{name}").ToString();
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("fieldValidation", fieldValidation);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<V1beta1CSIStorageCapacity>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<V1beta1CSIStorageCapacity>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse> LogFileListHandlerWithHttpMessagesAsync(
@@ -43671,20 +29941,16 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "logs/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"logs/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            HttpOperationResponse _result = new HttpOperationResponse() { Request = _httpRequest, Response =  _httpResponse };
-            return _result;
+            HttpOperationResponse result = new HttpOperationResponse() { Request = httpRequest, Response =  httpResponse };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse> LogFileHandlerWithHttpMessagesAsync(
@@ -43702,21 +29968,16 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "logs/{logpath}").ToString();
-            _url = _url.Replace("{logpath}", logpath);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"logs/{logpath}").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            HttpOperationResponse _result = new HttpOperationResponse() { Request = _httpRequest, Response =  _httpResponse };
-            return _result;
+            HttpOperationResponse result = new HttpOperationResponse() { Request = httpRequest, Response =  httpResponse };
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<string>> GetServiceAccountIssuerOpenIDKeysetWithHttpMessagesAsync(
@@ -43729,23 +29990,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "openid/v1/jwks/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"openid/v1/jwks/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<string>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<string>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<VersionInfo>> GetCodeWithHttpMessagesAsync(
@@ -43758,23 +30015,19 @@ namespace k8s
 
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "version/").ToString();
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"version/").ToString();
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<VersionInfo>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<VersionInfo>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ListClusterCustomObjectWithHttpMessagesAsync(
@@ -43816,66 +30069,30 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> CreateClusterCustomObjectWithHttpMessagesAsync(
@@ -43911,38 +30128,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> DeleteCollectionClusterCustomObjectWithHttpMessagesAsync(
@@ -43976,46 +30178,25 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("dryRun", dryRun);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ListNamespacedCustomObjectWithHttpMessagesAsync(
@@ -44062,67 +30243,30 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (allowWatchBookmarks != null)
-            {
-                _queryParameters.Add(string.Format("allowWatchBookmarks={0}", allowWatchBookmarks.Value ? "true" : "false"));
-            }
-            if (continueParameter != null)
-            {
-                _queryParameters.Add(string.Format("continue={0}", System.Uri.EscapeDataString(continueParameter)));
-            }
-            if (fieldSelector != null)
-            {
-                _queryParameters.Add(string.Format("fieldSelector={0}", System.Uri.EscapeDataString(fieldSelector)));
-            }
-            if (labelSelector != null)
-            {
-                _queryParameters.Add(string.Format("labelSelector={0}", System.Uri.EscapeDataString(labelSelector)));
-            }
-            if (limit != null)
-            {
-                _queryParameters.Add(string.Format("limit={0}", limit.Value));
-            }
-            if (resourceVersion != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersion={0}", System.Uri.EscapeDataString(resourceVersion)));
-            }
-            if (resourceVersionMatch != null)
-            {
-                _queryParameters.Add(string.Format("resourceVersionMatch={0}", System.Uri.EscapeDataString(resourceVersionMatch)));
-            }
-            if (timeoutSeconds != null)
-            {
-                _queryParameters.Add(string.Format("timeoutSeconds={0}", timeoutSeconds.Value));
-            }
-            if (watch != null)
-            {
-                _queryParameters.Add(string.Format("watch={0}", watch.Value ? "true" : "false"));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("allowWatchBookmarks", allowWatchBookmarks);
+            q.Append("continue", continueParameter);
+            q.Append("fieldSelector", fieldSelector);
+            q.Append("labelSelector", labelSelector);
+            q.Append("limit", limit);
+            q.Append("resourceVersion", resourceVersion);
+            q.Append("resourceVersionMatch", resourceVersionMatch);
+            q.Append("timeoutSeconds", timeoutSeconds);
+            q.Append("watch", watch);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 watch,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> CreateNamespacedCustomObjectWithHttpMessagesAsync(
@@ -44163,39 +30307,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Post, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Post, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> DeleteCollectionNamespacedCustomObjectWithHttpMessagesAsync(
@@ -44234,47 +30362,25 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (pretty != null)
-            {
-                _queryParameters.Add(string.Format("pretty={0}", pretty.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("dryRun", dryRun);
+            q.Append("pretty", pretty);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> GetClusterCustomObjectWithHttpMessagesAsync(
@@ -44307,27 +30413,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> DeleteClusterCustomObjectWithHttpMessagesAsync(
@@ -44365,43 +30464,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("dryRun", dryRun);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> PatchClusterCustomObjectWithHttpMessagesAsync(
@@ -44442,39 +30522,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("force", force);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ReplaceClusterCustomObjectWithHttpMessagesAsync(
@@ -44514,35 +30578,22 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> GetClusterCustomObjectStatusWithHttpMessagesAsync(
@@ -44575,27 +30626,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}/status").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}/status").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ReplaceClusterCustomObjectStatusWithHttpMessagesAsync(
@@ -44635,35 +30679,22 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}/status").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}/status").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> PatchClusterCustomObjectStatusWithHttpMessagesAsync(
@@ -44704,39 +30735,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}/status").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}/status").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("force", force);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> GetClusterCustomObjectScaleWithHttpMessagesAsync(
@@ -44769,27 +30784,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}/scale").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}/scale").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ReplaceClusterCustomObjectScaleWithHttpMessagesAsync(
@@ -44829,35 +30837,22 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}/scale").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}/scale").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> PatchClusterCustomObjectScaleWithHttpMessagesAsync(
@@ -44898,39 +30893,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/{plural}/{name}/scale").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/{plural}/{name}/scale").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("force", force);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> GetNamespacedCustomObjectWithHttpMessagesAsync(
@@ -44968,28 +30947,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> DeleteNamespacedCustomObjectWithHttpMessagesAsync(
@@ -45032,44 +31003,24 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (gracePeriodSeconds != null)
-            {
-                _queryParameters.Add(string.Format("gracePeriodSeconds={0}", gracePeriodSeconds.Value));
-            }
-            if (orphanDependents != null)
-            {
-                _queryParameters.Add(string.Format("orphanDependents={0}", orphanDependents.Value ? "true" : "false"));
-            }
-            if (propagationPolicy != null)
-            {
-                _queryParameters.Add(string.Format("propagationPolicy={0}", System.Uri.EscapeDataString(propagationPolicy)));
-            }
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("gracePeriodSeconds", gracePeriodSeconds);
+            q.Append("orphanDependents", orphanDependents);
+            q.Append("propagationPolicy", propagationPolicy);
+            q.Append("dryRun", dryRun);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Delete, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Delete, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> PatchNamespacedCustomObjectWithHttpMessagesAsync(
@@ -45115,40 +31066,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("force", force);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ReplaceNamespacedCustomObjectWithHttpMessagesAsync(
@@ -45193,36 +31127,22 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> GetNamespacedCustomObjectStatusWithHttpMessagesAsync(
@@ -45260,28 +31180,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}/status").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}/status").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ReplaceNamespacedCustomObjectStatusWithHttpMessagesAsync(
@@ -45326,36 +31238,22 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}/status").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}/status").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> PatchNamespacedCustomObjectStatusWithHttpMessagesAsync(
@@ -45401,40 +31299,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}/status").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}/status").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("force", force);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> GetNamespacedCustomObjectScaleWithHttpMessagesAsync(
@@ -45472,28 +31353,20 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}/scale").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}/scale").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Get, customHeaders);
-            var _httpResponse = await SendRequestRaw("", _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Get, customHeaders);
+            var httpResponse = await SendRequestRaw("", httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> ReplaceNamespacedCustomObjectScaleWithHttpMessagesAsync(
@@ -45538,36 +31411,22 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}/scale").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}/scale").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Put, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Put, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
         /// <inheritdoc/>
         public async Task<HttpOperationResponse<object>> PatchNamespacedCustomObjectScaleWithHttpMessagesAsync(
@@ -45613,40 +31472,23 @@ namespace k8s
             }
 
             // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "apis/{group}/{version}/namespaces/{namespace}/{plural}/{name}/scale").ToString();
-            _url = _url.Replace("{group}", group);
-            _url = _url.Replace("{version}", version);
-            _url = _url.Replace("{namespace}", namespaceParameter);
-            _url = _url.Replace("{plural}", plural);
-            _url = _url.Replace("{name}", name);
-            _url = _url.Replace("/apis//", "/api/");
-            List<string> _queryParameters = new List<string>();
-            if (dryRun != null)
-            {
-                _queryParameters.Add(string.Format("dryRun={0}", System.Uri.EscapeDataString(dryRun)));
-            }
-            if (fieldManager != null)
-            {
-                _queryParameters.Add(string.Format("fieldManager={0}", System.Uri.EscapeDataString(fieldManager)));
-            }
-            if (force != null)
-            {
-                _queryParameters.Add(string.Format("force={0}", force.Value ? "true" : "false"));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += "?" + string.Join("&", _queryParameters);
-            }
+            var url = new System.Uri(BaseUri, $"apis/{group}/{version}/namespaces/{namespaceParameter}/{plural}/{name}/scale").ToString();
+            url = url.Replace("/apis//", "/api/");
+            var q = new QueryBuilder();
+            q.Append("dryRun", dryRun);
+            q.Append("fieldManager", fieldManager);
+            q.Append("force", force);
+            url += q.ToString();
+
             // Create HTTP transport
-            var _httpRequest = CreateRequest(_url, HttpMethod.Patch, customHeaders);
-            var _httpResponse = await SendRequest(body, _httpRequest, cancellationToken);
+            var httpRequest = CreateRequest(url, HttpMethod.Patch, customHeaders);
+            var httpResponse = await SendRequest(body, httpRequest, cancellationToken);
             // Create Result
-            var _result = await CreateResultAsync<object>(_httpRequest,
-                _httpResponse,
+            var result = await CreateResultAsync<object>(httpRequest,
+                httpResponse,
                 false,
                 cancellationToken);
-            return _result;
+            return result;
         }
     }
 }