diff --git a/Apizr/Src/Apizr.Extensions.Microsoft.DependencyInjection/Apizr.Extensions.Microsoft.DependencyInjection.xml b/Apizr/Src/Apizr.Extensions.Microsoft.DependencyInjection/Apizr.Extensions.Microsoft.DependencyInjection.xml
index d8f2153f..ecd1a53b 100644
--- a/Apizr/Src/Apizr.Extensions.Microsoft.DependencyInjection/Apizr.Extensions.Microsoft.DependencyInjection.xml
+++ b/Apizr/Src/Apizr.Extensions.Microsoft.DependencyInjection/Apizr.Extensions.Microsoft.DependencyInjection.xml
@@ -55,7 +55,10 @@
         <member name="P:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptions.HeadersFactory">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptions.TimeoutFactory">
+        <member name="P:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptions.OperationTimeoutFactory">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptions.RequestTimeoutFactory">
             <inheritdoc />
         </member>
         <member name="P:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptions.DelegatingHandlersExtendedFactories">
@@ -132,10 +135,16 @@
         <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithHeaders(System.Func{System.IServiceProvider,System.Collections.Generic.IList{System.String}})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithOperationTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
+        <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.WithRequestTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Extending.Configuring.Common.ApizrExtendedCommonOptionsBuilder.AddDelegatingHandler``1(``0)">
@@ -401,9 +410,6 @@
         <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.MappingHandlerType">
             <inheritdoc />
         </member>
-        <member name="F:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions._baseUriFactory">
-            <inheritdoc />
-        </member>
         <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.BaseUriFactory">
             <inheritdoc />
         </member>
@@ -446,7 +452,10 @@
         <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.HeadersFactory">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.TimeoutFactory">
+        <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.OperationTimeoutFactory">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.RequestTimeoutFactory">
             <inheritdoc />
         </member>
         <member name="P:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptions.CrudEntities">
@@ -541,10 +550,16 @@
         <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithHeaders(System.Func{System.IServiceProvider,System.Collections.Generic.IList{System.String}})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithOperationTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
+        <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.WithRequestTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Extending.Configuring.Manager.ApizrExtendedManagerOptionsBuilder.AddDelegatingHandler``1(``0)">
@@ -699,7 +714,10 @@
         <member name="P:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptions.HeadersFactory">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptions.TimeoutFactory">
+        <member name="P:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptions.OperationTimeoutFactory">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptions.RequestTimeoutFactory">
             <inheritdoc />
         </member>
         <member name="P:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptions.DelegatingHandlersExtendedFactories">
@@ -764,10 +782,16 @@
         <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithHeaders(System.Func{System.IServiceProvider,System.Collections.Generic.IList{System.String}})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithOperationTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
+        <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.WithRequestTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Extending.Configuring.Proper.ApizrExtendedProperOptionsBuilder.AddDelegatingHandler``1(``0)">
@@ -1210,9 +1234,14 @@
             Headers factory
             </summary>
         </member>
-        <member name="P:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptions.TimeoutFactory">
+        <member name="P:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptions.OperationTimeoutFactory">
             <summary>
-            Timeout factory
+            The operation timeout factory (overall request tries)
+            </summary>
+        </member>
+        <member name="P:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptions.RequestTimeoutFactory">
+            <summary>
+            The request timeout factory (each request try)
             </summary>
         </member>
         <member name="T:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptionsBase">
@@ -1338,9 +1367,16 @@
             <param name="headersFactory">Headers to add to the request</param>
             <returns></returns>
         </member>
-        <member name="M:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptionsBuilder`2.WithTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
+        <member name="M:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptionsBuilder`2.WithOperationTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
+            <summary>
+            Set a timeout to the operation (overall request tries)
+            </summary>
+            <param name="timeoutFactory">The operation timeout factory</param>
+            <returns></returns>
+        </member>
+        <member name="M:Apizr.Extending.Configuring.Shared.IApizrExtendedSharedOptionsBuilder`2.WithRequestTimeout(System.Func{System.IServiceProvider,System.TimeSpan})">
             <summary>
-            Set a timeout to the request
+            Set a timeout to the request (each request try)
             </summary>
             <param name="timeoutFactory">The request timeout factory</param>
             <returns></returns>
diff --git a/Apizr/Src/Apizr/Apizr.xml b/Apizr/Src/Apizr/Apizr.xml
index b68901c9..024e0712 100644
--- a/Apizr/Src/Apizr/Apizr.xml
+++ b/Apizr/Src/Apizr/Apizr.xml
@@ -43,9 +43,6 @@
             An exception with optional cached <typeparamref name="TResult"/>
             </summary>
         </member>
-        <member name="M:Apizr.ApizrHttpMessageHandler.SendAsync(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)">
-            <inheritdoc />
-        </member>
         <member name="T:Apizr.ApizrManager`1">
             <summary>
             The manager
@@ -505,58 +502,94 @@
         <member name="M:Apizr.Caching.VoidCacheHandler.RemoveAsync(System.String,System.Threading.CancellationToken)">
             <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutAttribute">
+        <member name="T:Apizr.Cancelling.Attributes.Operation.CreateOperationTimeoutAttribute">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutAttribute.#ctor(System.String)">
+        <member name="M:Apizr.Cancelling.Attributes.Operation.CreateOperationTimeoutAttribute.#ctor(System.String)">
             <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutAttributeBase">
-            <summary>
-            Tells Apizr to set a timeout to the request
-            </summary>
+        <member name="T:Apizr.Cancelling.Attributes.Operation.DeleteOperationTimeoutAttribute">
+            <inheritdoc />
         </member>
-        <member name="P:Apizr.Cancelling.Attributes.TimeoutAttributeBase.Timeout">
-            <summary>
-            This request timeout
-            </summary>
+        <member name="M:Apizr.Cancelling.Attributes.Operation.DeleteOperationTimeoutAttribute.#ctor(System.String)">
+            <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutAttributeBase.#ctor(System.String)">
-            <summary>
-            Request times out after a specific duration
-            </summary>
-            <param name="timeoutRepresentation">TimeSpan representation to parse</param>
+        <member name="T:Apizr.Cancelling.Attributes.Operation.OperationTimeoutAttribute">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Cancelling.Attributes.Operation.OperationTimeoutAttribute.#ctor(System.String)">
+            <inheritdoc />
+        </member>
+        <member name="T:Apizr.Cancelling.Attributes.Operation.ReadAllOperationTimeoutAttribute">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Cancelling.Attributes.Operation.ReadAllOperationTimeoutAttribute.#ctor(System.String)">
+            <inheritdoc />
+        </member>
+        <member name="T:Apizr.Cancelling.Attributes.Operation.ReadOperationTimeoutAttribute">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Cancelling.Attributes.Operation.ReadOperationTimeoutAttribute.#ctor(System.String)">
+            <inheritdoc />
+        </member>
+        <member name="T:Apizr.Cancelling.Attributes.Operation.UpdateOperationTimeoutAttribute">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Cancelling.Attributes.Operation.UpdateOperationTimeoutAttribute.#ctor(System.String)">
+            <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutCreateAttribute">
+        <member name="T:Apizr.Cancelling.Attributes.Request.CreateRequestTimeoutAttribute">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutCreateAttribute.#ctor(System.String)">
+        <member name="M:Apizr.Cancelling.Attributes.Request.CreateRequestTimeoutAttribute.#ctor(System.String)">
             <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutDeleteAttribute">
+        <member name="T:Apizr.Cancelling.Attributes.Request.DeleteRequestTimeoutAttribute">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutDeleteAttribute.#ctor(System.String)">
+        <member name="M:Apizr.Cancelling.Attributes.Request.DeleteRequestTimeoutAttribute.#ctor(System.String)">
             <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutReadAllAttribute">
+        <member name="T:Apizr.Cancelling.Attributes.Request.ReadAllRequestTimeoutAttribute">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutReadAllAttribute.#ctor(System.String)">
+        <member name="M:Apizr.Cancelling.Attributes.Request.ReadAllRequestTimeoutAttribute.#ctor(System.String)">
             <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutReadAttribute">
+        <member name="T:Apizr.Cancelling.Attributes.Request.ReadRequestTimeoutAttribute">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutReadAttribute.#ctor(System.String)">
+        <member name="M:Apizr.Cancelling.Attributes.Request.ReadRequestTimeoutAttribute.#ctor(System.String)">
             <inheritdoc />
         </member>
-        <member name="T:Apizr.Cancelling.Attributes.TimeoutUpdateAttribute">
+        <member name="T:Apizr.Cancelling.Attributes.Request.RequestTimeoutAttribute">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Cancelling.Attributes.TimeoutUpdateAttribute.#ctor(System.String)">
+        <member name="M:Apizr.Cancelling.Attributes.Request.RequestTimeoutAttribute.#ctor(System.String)">
             <inheritdoc />
         </member>
+        <member name="T:Apizr.Cancelling.Attributes.Request.UpdateRequestTimeoutAttribute">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Cancelling.Attributes.Request.UpdateRequestTimeoutAttribute.#ctor(System.String)">
+            <inheritdoc />
+        </member>
+        <member name="T:Apizr.Cancelling.Attributes.TimeoutAttributeBase">
+            <summary>
+            Tells Apizr to set a timeout to the request
+            </summary>
+        </member>
+        <member name="P:Apizr.Cancelling.Attributes.TimeoutAttributeBase.Timeout">
+            <summary>
+            This request timeout
+            </summary>
+        </member>
+        <member name="M:Apizr.Cancelling.Attributes.TimeoutAttributeBase.#ctor(System.String)">
+            <summary>
+            Request times out after a specific duration
+            </summary>
+            <param name="timeoutRepresentation">TimeSpan representation to parse</param>
+        </member>
         <member name="T:Apizr.Configuring.ApizrDuplicateStrategy">
             <summary>
             Duplicate strategy about options registration
@@ -612,7 +645,10 @@
         <member name="P:Apizr.Configuring.Common.ApizrCommonOptions.HeadersFactory">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Configuring.Common.ApizrCommonOptions.TimeoutFactory">
+        <member name="P:Apizr.Configuring.Common.ApizrCommonOptions.OperationTimeoutFactory">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Configuring.Common.ApizrCommonOptions.RequestTimeoutFactory">
             <inheritdoc />
         </member>
         <member name="P:Apizr.Configuring.Common.ApizrCommonOptions.HttpTracerModeFactory">
@@ -763,10 +799,16 @@
         <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithHeaders(System.Func{System.Collections.Generic.IList{System.String}})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithTimeout(System.Func{System.TimeSpan})">
+        <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithOperationTimeout(System.Func{System.TimeSpan})">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithRequestTimeout(System.Func{System.TimeSpan})">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Configuring.Common.ApizrCommonOptionsBuilder.WithContext(System.Func{Polly.Context},Apizr.Configuring.ApizrDuplicateStrategy)">
@@ -1038,7 +1080,10 @@
         <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions.HeadersFactory">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions.TimeoutFactory">
+        <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions.OperationTimeoutFactory">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions.RequestTimeoutFactory">
             <inheritdoc />
         </member>
         <member name="T:Apizr.Configuring.Manager.ApizrManagerOptions`1">
@@ -1094,7 +1139,10 @@
         <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions`1.Headers">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions`1.Timeout">
+        <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions`1.OperationTimeout">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions`1.RequestTimeout">
             <inheritdoc />
         </member>
         <member name="P:Apizr.Configuring.Manager.ApizrManagerOptions`1.Logger">
@@ -1261,10 +1309,16 @@
         <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithHeaders(System.Func{System.Collections.Generic.IList{System.String}})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithTimeout(System.Func{System.TimeSpan})">
+        <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithOperationTimeout(System.Func{System.TimeSpan})">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithRequestTimeout(System.Func{System.TimeSpan})">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Configuring.Manager.ApizrManagerOptionsBuilder.WithLoggerFactory(Microsoft.Extensions.Logging.ILoggerFactory)">
@@ -1336,7 +1390,7 @@
         <member name="T:Apizr.Configuring.Proper.ApizrProperOptions">
             <inheritdoc cref="T:Apizr.Configuring.Proper.IApizrProperOptions"/>
         </member>
-        <member name="M:Apizr.Configuring.Proper.ApizrProperOptions.#ctor(Apizr.Configuring.Shared.IApizrSharedRegistrationOptions,System.Type,System.String[],System.String[],System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object},System.Nullable{Apizr.Logging.HttpTracerMode},System.Nullable{Apizr.Logging.HttpMessageParts},System.Nullable{System.TimeSpan},Microsoft.Extensions.Logging.LogLevel[])">
+        <member name="M:Apizr.Configuring.Proper.ApizrProperOptions.#ctor(Apizr.Configuring.Shared.IApizrSharedRegistrationOptions,System.Type,System.String[],System.String[],System.String,System.String,System.Collections.Generic.IDictionary{System.String,System.Object},System.Nullable{Apizr.Logging.HttpTracerMode},System.Nullable{Apizr.Logging.HttpMessageParts},System.Nullable{System.TimeSpan},System.Nullable{System.TimeSpan},Microsoft.Extensions.Logging.LogLevel[])">
             <summary>
             The common options constructor
             </summary>
@@ -1349,7 +1403,8 @@
             <param name="handlersParameters">Some handlers parameters</param>
             <param name="httpTracerMode">The http tracer mode</param>
             <param name="trafficVerbosity">The traffic verbosity</param>
-            <param name="timeout">The request timeout</param>
+            <param name="operationTimeout">The operation timeout</param>
+            <param name="requestTimeout">The request timeout</param>
             <param name="logLevels">The log levels</param>
         </member>
         <member name="P:Apizr.Configuring.Proper.ApizrProperOptions.BaseUriFactory">
@@ -1388,7 +1443,10 @@
         <member name="P:Apizr.Configuring.Proper.ApizrProperOptions.HeadersFactory">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Configuring.Proper.ApizrProperOptions.TimeoutFactory">
+        <member name="P:Apizr.Configuring.Proper.ApizrProperOptions.OperationTimeoutFactory">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Configuring.Proper.ApizrProperOptions.RequestTimeoutFactory">
             <inheritdoc />
         </member>
         <member name="T:Apizr.Configuring.Proper.ApizrProperOptionsBase">
@@ -1518,10 +1576,16 @@
         <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithHeaders(System.Func{System.Collections.Generic.IList{System.String}})">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithTimeout(System.Func{System.TimeSpan})">
+        <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithOperationTimeout(System.Func{System.TimeSpan})">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.WithRequestTimeout(System.Func{System.TimeSpan})">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Configuring.Proper.ApizrProperOptionsBuilder.Apizr#Configuring#Shared#IApizrInternalRegistrationOptionsBuilder#AddDelegatingHandler``1(System.Func{Apizr.Configuring.Manager.IApizrManagerOptionsBase,``0})">
@@ -1995,7 +2059,7 @@
         <member name="T:Apizr.Configuring.Request.ApizrRequestOptionsBase">
             <inheritdoc cref="T:Apizr.Configuring.Request.IApizrRequestOptionsBase" />
         </member>
-        <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBase.#ctor(Apizr.Configuring.Shared.IApizrGlobalSharedRegistrationOptionsBase,System.Nullable{Apizr.Logging.HttpTracerMode},System.Nullable{Apizr.Logging.HttpMessageParts},System.Nullable{System.TimeSpan},Microsoft.Extensions.Logging.LogLevel[])">
+        <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBase.#ctor(Apizr.Configuring.Shared.IApizrGlobalSharedRegistrationOptionsBase,System.Nullable{Apizr.Logging.HttpTracerMode},System.Nullable{Apizr.Logging.HttpMessageParts},System.Nullable{System.TimeSpan},System.Nullable{System.TimeSpan},Microsoft.Extensions.Logging.LogLevel[])">
             <inheritdoc />
         </member>
         <member name="P:Apizr.Configuring.Request.ApizrRequestOptionsBase.Context">
@@ -2013,7 +2077,10 @@
         <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBuilder.WithHeaders(System.String[])">
             <inheritdoc />
         </member>
-        <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBuilder.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBuilder.WithOperationTimeout(System.TimeSpan)">
+            <inheritdoc />
+        </member>
+        <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBuilder.WithRequestTimeout(System.TimeSpan)">
             <inheritdoc />
         </member>
         <member name="M:Apizr.Configuring.Request.ApizrRequestOptionsBuilder.WithContext(Polly.Context,Apizr.Configuring.ApizrDuplicateStrategy)">
@@ -2107,7 +2174,7 @@
         </member>
         <member name="T:Apizr.Configuring.Shared.ApizrGlobalSharedOptionsBase">
             <summary>
-            Options available at both common and proper level for both static and extended registrations
+            Options available at every level for both static and extended registrations
             </summary>
         </member>
         <member name="P:Apizr.Configuring.Shared.ApizrGlobalSharedOptionsBase.HttpTracerMode">
@@ -2131,7 +2198,10 @@
         <member name="P:Apizr.Configuring.Shared.ApizrGlobalSharedOptionsBase.Headers">
             <inheritdoc />
         </member>
-        <member name="P:Apizr.Configuring.Shared.ApizrGlobalSharedOptionsBase.Timeout">
+        <member name="P:Apizr.Configuring.Shared.ApizrGlobalSharedOptionsBase.OperationTimeout">
+            <inheritdoc />
+        </member>
+        <member name="P:Apizr.Configuring.Shared.ApizrGlobalSharedOptionsBase.RequestTimeout">
             <inheritdoc />
         </member>
         <member name="T:Apizr.Configuring.Shared.ApizrGlobalSharedRegistrationOptionsBase">
@@ -2199,9 +2269,14 @@
             Headers to add to the request
             </summary>
         </member>
-        <member name="P:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBase.Timeout">
+        <member name="P:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBase.OperationTimeout">
             <summary>
-            Request timeout
+            The operation timeout (overall request tries)
+            </summary>
+        </member>
+        <member name="P:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBase.RequestTimeout">
+            <summary>
+            The request timeout (each request try)
             </summary>
         </member>
         <member name="T:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBuilderBase">
@@ -2254,9 +2329,16 @@
             <param name="headers">Headers to add to the request</param>
             <returns></returns>
         </member>
-        <member name="M:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBuilderBase`2.WithTimeout(System.TimeSpan)">
+        <member name="M:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBuilderBase`2.WithOperationTimeout(System.TimeSpan)">
             <summary>
-            Set a timeout to the request
+            Set a timeout to the operation (overall request tries)
+            </summary>
+            <param name="timeout">The operation timeout</param>
+            <returns></returns>
+        </member>
+        <member name="M:Apizr.Configuring.Shared.IApizrGlobalSharedOptionsBuilderBase`2.WithRequestTimeout(System.TimeSpan)">
+            <summary>
+            Set a timeout to the request (each request try)
             </summary>
             <param name="timeout">The request timeout</param>
             <returns></returns>
@@ -2409,9 +2491,14 @@
             Headers factory
             </summary>
         </member>
-        <member name="P:Apizr.Configuring.Shared.IApizrSharedRegistrationOptions.TimeoutFactory">
+        <member name="P:Apizr.Configuring.Shared.IApizrSharedRegistrationOptions.OperationTimeoutFactory">
+            <summary>
+            The operation timeout factory (overall request tries)
+            </summary>
+        </member>
+        <member name="P:Apizr.Configuring.Shared.IApizrSharedRegistrationOptions.RequestTimeoutFactory">
             <summary>
-            Request timeout factory
+            The request timeout factory (each request try)
             </summary>
         </member>
         <member name="T:Apizr.Configuring.Shared.IApizrSharedRegistrationOptionsBase">
@@ -2577,9 +2664,16 @@
             <param name="headersFactory">Headers factory</param>
             <returns></returns>
         </member>
-        <member name="M:Apizr.Configuring.Shared.IApizrSharedRegistrationOptionsBuilder`2.WithTimeout(System.Func{System.TimeSpan})">
+        <member name="M:Apizr.Configuring.Shared.IApizrSharedRegistrationOptionsBuilder`2.WithOperationTimeout(System.Func{System.TimeSpan})">
             <summary>
-            Set a timeout to the request
+            Set a timeout to the operation (overall request tries)
+            </summary>
+            <param name="timeoutFactory">The operation timeout factory</param>
+            <returns></returns>
+        </member>
+        <member name="M:Apizr.Configuring.Shared.IApizrSharedRegistrationOptionsBuilder`2.WithRequestTimeout(System.Func{System.TimeSpan})">
+            <summary>
+            Set a timeout to the request (each request try)
             </summary>
             <param name="timeoutFactory">The request timeout factory</param>
             <returns></returns>
@@ -3434,6 +3528,11 @@
             <param name="enumerable">The source enumerable</param>
             <returns></returns>
         </member>
+        <member name="M:Apizr.Extending.HttpRequestMessageExtensions.TrySetHeader(System.Net.Http.Headers.HttpHeaders,System.String,System.String,System.Boolean)">
+            <summary>
+            Cloned from Refit repository
+            </summary>
+        </member>
         <member name="T:Apizr.Extending.TypeExtensions">
             <summary>
             Some Type extensions
@@ -3469,11 +3568,6 @@
             <param name="type">The type to get friendly name of</param>
             <returns></returns>
         </member>
-        <member name="M:Apizr.Helping.RequestHelper.SetHeader(System.Net.Http.HttpRequestMessage,System.String,System.String)">
-            <summary>
-            Cloned from Refit repository
-            </summary>
-        </member>
         <member name="T:Apizr.Helping.UrlHelper">
             <summary>
             Some url helpers
@@ -4466,25 +4560,26 @@
             A <see cref="T:System.Net.Http.DelegatingHandler"/> implementation that executes request processing surrounded by a <see cref="T:Polly.Policy"/>.
             </summary>
         </member>
-        <member name="M:Apizr.Policing.PolicyHttpMessageHandler.#ctor(Polly.IAsyncPolicy{System.Net.Http.HttpResponseMessage})">
+        <member name="M:Apizr.Policing.PolicyHttpMessageHandler.#ctor(Polly.IAsyncPolicy{System.Net.Http.HttpResponseMessage},Apizr.Configuring.Manager.IApizrManagerOptionsBase)">
             <summary>
             Creates a new <see cref="T:Apizr.Policing.PolicyHttpMessageHandler"/>.
             </summary>
             <param name="policy">The policy.</param>
         </member>
-        <member name="M:Apizr.Policing.PolicyHttpMessageHandler.#ctor(System.Func{System.Net.Http.HttpRequestMessage,Polly.IAsyncPolicy{System.Net.Http.HttpResponseMessage}})">
+        <member name="M:Apizr.Policing.PolicyHttpMessageHandler.#ctor(System.Func{System.Net.Http.HttpRequestMessage,Polly.IAsyncPolicy{System.Net.Http.HttpResponseMessage}},Apizr.Configuring.Manager.IApizrManagerOptionsBase)">
             <summary>
             Creates a new <see cref="T:Apizr.Policing.PolicyHttpMessageHandler"/>.
             </summary>
             <param name="policySelector">A function which can select the desired policy for a given <see cref="T:System.Net.Http.HttpRequestMessage"/>.</param>
         </member>
-        <member name="M:Apizr.Policing.PolicyHttpMessageHandler.SendCoreAsync(System.Net.Http.HttpRequestMessage,Polly.Context,System.Threading.CancellationToken)">
+        <member name="M:Apizr.Policing.PolicyHttpMessageHandler.SendCoreAsync(System.Net.Http.HttpRequestMessage,Polly.Context,System.Threading.CancellationToken,System.Threading.CancellationToken)">
             <summary>
             Called inside the execution of the <see cref="T:Polly.Policy"/> to perform request processing.
             </summary>
             <param name="request">The <see cref="T:System.Net.Http.HttpRequestMessage"/>.</param>
             <param name="context">The <see cref="T:Polly.Context"/>.</param>
             <param name="cancellationToken">The <see cref="T:System.Threading.CancellationToken"/>.</param>
+            <param name="optionsCancellationToken"></param>
             <returns>Returns a <see cref="T:System.Threading.Tasks.Task`1"/> that will yield a response when completed.</returns>
         </member>
         <member name="T:Apizr.Policing.PollyContextExtensions">
diff --git a/Apizr/Tools/Apizr.Tools.NSwag/Apizr.Tools.NSwag.csproj b/Apizr/Tools/Apizr.Tools.NSwag/Apizr.Tools.NSwag.csproj
index cba537c5..ec87922a 100644
--- a/Apizr/Tools/Apizr.Tools.NSwag/Apizr.Tools.NSwag.csproj
+++ b/Apizr/Tools/Apizr.Tools.NSwag/Apizr.Tools.NSwag.csproj
@@ -9,7 +9,7 @@
 	  <ToolCommandName>apizr</ToolCommandName>
 	  <!-- NuGet package metadata -->
 	  <PackageId>Apizr.Tools.NSwag</PackageId>
-	  <PackageVersion>5.3.0</PackageVersion>
+	  <PackageVersion>5.4.0</PackageVersion>
 	  <Description>An Apizr .NET Tool to generate models, interfaces and registration methods from a swagger url</Description>
 	  <Authors>Respawnsive</Authors>
 	  <PackageTags>Refit Web Api Generator CLI</PackageTags>
diff --git a/nuget/Apizr.Extensions.Microsoft.Caching.nuspec b/nuget/Apizr.Extensions.Microsoft.Caching.nuspec
index 8e701df5..1cf0e91c 100644
--- a/nuget/Apizr.Extensions.Microsoft.Caching.nuspec
+++ b/nuget/Apizr.Extensions.Microsoft.Caching.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Extensions.Microsoft.Caching</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Extensions.Microsoft.Caching</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Cache Web Api Extensions</tags>
     <dependencies>
       <dependency id="Microsoft.Extensions.Caching.Abstractions" version="7.0.0" />
-      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="5.3.0" />
+      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Extensions.Microsoft.DependencyInjection.nuspec b/nuget/Apizr.Extensions.Microsoft.DependencyInjection.nuspec
index 2c173c6d..d346de0c 100644
--- a/nuget/Apizr.Extensions.Microsoft.DependencyInjection.nuspec
+++ b/nuget/Apizr.Extensions.Microsoft.DependencyInjection.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Extensions.Microsoft.DependencyInjection</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Extensions.Microsoft.DependencyInjection</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="Refit" version="7.0.0" />
       <dependency id="Microsoft.Extensions.Http.Polly" version="7.0.9" />
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Extensions.Microsoft.FileTransfer.nuspec b/nuget/Apizr.Extensions.Microsoft.FileTransfer.nuspec
index c25d44f7..01e3243e 100644
--- a/nuget/Apizr.Extensions.Microsoft.FileTransfer.nuspec
+++ b/nuget/Apizr.Extensions.Microsoft.FileTransfer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Extensions.Microsoft.FileTransfer</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Extensions.Microsoft.FileTransfer</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http File Transfer Download Upload</tags>
     <dependencies>
-      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="5.3.0" />
-      <dependency id="Apizr.Integrations.FileTransfer" version="5.3.0" />
+      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="5.4.0" />
+      <dependency id="Apizr.Integrations.FileTransfer" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.Akavache.nuspec b/nuget/Apizr.Integrations.Akavache.nuspec
index 1d5284b9..c7f44b74 100644
--- a/nuget/Apizr.Integrations.Akavache.nuspec
+++ b/nuget/Apizr.Integrations.Akavache.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.Akavache</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.Akavache</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Polly Fusillade HttpTracer Web Api Akavache</tags>
     <dependencies>
       <dependency id="akavache" version="9.1.20" />
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.AutoMapper.nuspec b/nuget/Apizr.Integrations.AutoMapper.nuspec
index 4c8f93ac..50eebe88 100644
--- a/nuget/Apizr.Integrations.AutoMapper.nuspec
+++ b/nuget/Apizr.Integrations.AutoMapper.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.AutoMapper</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.AutoMapper</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Web Api AutoMapper</tags>
     <dependencies>
       <dependency id="AutoMapper" version="12.0.1" />
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.FileTransfer.MediatR.nuspec b/nuget/Apizr.Integrations.FileTransfer.MediatR.nuspec
index 61b653cc..17653ab9 100644
--- a/nuget/Apizr.Integrations.FileTransfer.MediatR.nuspec
+++ b/nuget/Apizr.Integrations.FileTransfer.MediatR.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.FileTransfer.MediatR</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.FileTransfer.MediatR</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http Transfer</tags>
     <dependencies>
-      <dependency id="Apizr.Integrations.MediatR" version="5.3.0" />
-      <dependency id="Apizr.Extensions.Microsoft.FileTransfer" version="5.3.0" />
+      <dependency id="Apizr.Integrations.MediatR" version="5.4.0" />
+      <dependency id="Apizr.Extensions.Microsoft.FileTransfer" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.FileTransfer.Optional.nuspec b/nuget/Apizr.Integrations.FileTransfer.Optional.nuspec
index 1bd3bf83..3fd3ca5e 100644
--- a/nuget/Apizr.Integrations.FileTransfer.Optional.nuspec
+++ b/nuget/Apizr.Integrations.FileTransfer.Optional.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.FileTransfer.Optional</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.FileTransfer.Optional</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,8 +15,8 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http Transfer</tags>
     <dependencies>
-      <dependency id="Apizr.Integrations.Optional" version="5.3.0" />
-      <dependency id="Apizr.Integrations.FileTransfer.MediatR" version="5.3.0" />
+      <dependency id="Apizr.Integrations.Optional" version="5.4.0" />
+      <dependency id="Apizr.Integrations.FileTransfer.MediatR" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.FileTransfer.nuspec b/nuget/Apizr.Integrations.FileTransfer.nuspec
index 1e8b8ccf..303baa20 100644
--- a/nuget/Apizr.Integrations.FileTransfer.nuspec
+++ b/nuget/Apizr.Integrations.FileTransfer.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.FileTransfer</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.FileTransfer</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -15,7 +15,7 @@
     <releaseNotes>https://www.apizr.net/changelog.html</releaseNotes>
     <tags>Refit Web Api Http Transfer</tags>
     <dependencies>
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.Fusillade.nuspec b/nuget/Apizr.Integrations.Fusillade.nuspec
index 835bda52..dac4fdf9 100644
--- a/nuget/Apizr.Integrations.Fusillade.nuspec
+++ b/nuget/Apizr.Integrations.Fusillade.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.Fusillade</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.Fusillade</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Fusillade Web Api Akavache</tags>
     <dependencies>
       <dependency id="fusillade" version="2.4.67" />
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.Mapster.nuspec b/nuget/Apizr.Integrations.Mapster.nuspec
index 2b0237fb..0d84b286 100644
--- a/nuget/Apizr.Integrations.Mapster.nuspec
+++ b/nuget/Apizr.Integrations.Mapster.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.Mapster</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.Mapster</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Mapster</tags>
     <dependencies>
       <dependency id="Mapster" version="7.3.0" />
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.MediatR.nuspec b/nuget/Apizr.Integrations.MediatR.nuspec
index 5df4a4b5..ea301f0f 100644
--- a/nuget/Apizr.Integrations.MediatR.nuspec
+++ b/nuget/Apizr.Integrations.MediatR.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.MediatR</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.MediatR</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Web Api MediatR</tags>
     <dependencies>
       <dependency id="MediatR" version="12.1.1" />
-      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="5.3.0" />
+      <dependency id="Apizr.Extensions.Microsoft.DependencyInjection" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.MonkeyCache.nuspec b/nuget/Apizr.Integrations.MonkeyCache.nuspec
index f57a7ab3..01e5fed1 100644
--- a/nuget/Apizr.Integrations.MonkeyCache.nuspec
+++ b/nuget/Apizr.Integrations.MonkeyCache.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.MonkeyCache</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.MonkeyCache</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Cache MonkeyCache</tags>
     <dependencies>
       <dependency id="MonkeyCache" version="1.6.3" />
-      <dependency id="Apizr" version="5.3.0" />
+      <dependency id="Apizr" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Integrations.Optional.nuspec b/nuget/Apizr.Integrations.Optional.nuspec
index 4b305d7d..20d33609 100644
--- a/nuget/Apizr.Integrations.Optional.nuspec
+++ b/nuget/Apizr.Integrations.Optional.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr.Integrations.Optional</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr.Integrations.Optional</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>
@@ -16,7 +16,7 @@
     <tags>Refit Web Api Optional</tags>
     <dependencies>
       <dependency id="Optional.Async" version="1.3.0" />
-      <dependency id="Apizr.Integrations.MediatR" version="5.3.0" />
+      <dependency id="Apizr.Integrations.MediatR" version="5.4.0" />
     </dependencies>
   </metadata>
   <files>
diff --git a/nuget/Apizr.Tools.NSwag.nuspec b/nuget/Apizr.Tools.NSwag.nuspec
index 0997efd6..fd6ebc79 100644
--- a/nuget/Apizr.Tools.NSwag.nuspec
+++ b/nuget/Apizr.Tools.NSwag.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Apizr.Tools.NSwag</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <authors>Respawnsive</authors>
     <owners></owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
diff --git a/nuget/Apizr.nuspec b/nuget/Apizr.nuspec
index 6b26178e..b246b3c6 100644
--- a/nuget/Apizr.nuspec
+++ b/nuget/Apizr.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>Apizr</id>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <title>Apizr</title>
     <authors>Respawnsive</authors>
     <owners>Respawnsive</owners>