diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION
index 5f84a81..eb1dc6a 100644
--- a/.openapi-generator/VERSION
+++ b/.openapi-generator/VERSION
@@ -1 +1 @@
-7.12.0
+7.13.0
diff --git a/src/Regula.DocumentReader.WebClient/Api/HealthcheckApi.cs b/src/Regula.DocumentReader.WebClient/Api/HealthcheckApi.cs
index 99044d7..80909a9 100644
--- a/src/Regula.DocumentReader.WebClient/Api/HealthcheckApi.cs
+++ b/src/Regula.DocumentReader.WebClient/Api/HealthcheckApi.cs
@@ -33,7 +33,7 @@ public interface IHealthcheckApiSync : IApiAccessor
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>Healthcheck</returns>
-        Healthcheck Healthz(string? xRequestID = default(string?));
+        Healthcheck Healthz(string? xRequestID = default);
 
         /// <summary>
         /// Server health check
@@ -44,7 +44,7 @@ public interface IHealthcheckApiSync : IApiAccessor
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of Healthcheck</returns>
-        ApiResponse<Healthcheck> HealthzWithHttpInfo(string? xRequestID = default(string?));
+        ApiResponse<Healthcheck> HealthzWithHttpInfo(string? xRequestID = default);
         /// <summary>
         /// Server health check
         /// </summary>
@@ -52,7 +52,7 @@ public interface IHealthcheckApiSync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>DeviceInfo</returns>
         [Obsolete]
-        DeviceInfo Ping(string? xRequestID = default(string?));
+        DeviceInfo Ping(string? xRequestID = default);
 
         /// <summary>
         /// Server health check
@@ -64,14 +64,14 @@ public interface IHealthcheckApiSync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of DeviceInfo</returns>
         [Obsolete]
-        ApiResponse<DeviceInfo> PingWithHttpInfo(string? xRequestID = default(string?));
+        ApiResponse<DeviceInfo> PingWithHttpInfo(string? xRequestID = default);
         /// <summary>
         /// License health check
         /// </summary>
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns></returns>
-        void Readyz(string? xRequestID = default(string?));
+        void Readyz(string? xRequestID = default);
 
         /// <summary>
         /// License health check
@@ -82,7 +82,7 @@ public interface IHealthcheckApiSync : IApiAccessor
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> ReadyzWithHttpInfo(string? xRequestID = default(string?));
+        ApiResponse<Object> ReadyzWithHttpInfo(string? xRequestID = default);
         #endregion Synchronous Operations
     }
 
@@ -102,7 +102,7 @@ public interface IHealthcheckApiAsync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of Healthcheck</returns>
-        System.Threading.Tasks.Task<Healthcheck> HealthzAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Healthcheck> HealthzAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Server health check
@@ -114,7 +114,7 @@ public interface IHealthcheckApiAsync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (Healthcheck)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Healthcheck>> HealthzWithHttpInfoAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<Healthcheck>> HealthzWithHttpInfoAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// Server health check
         /// </summary>
@@ -126,7 +126,7 @@ public interface IHealthcheckApiAsync : IApiAccessor
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of DeviceInfo</returns>
         [Obsolete]
-        System.Threading.Tasks.Task<DeviceInfo> PingAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<DeviceInfo> PingAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Server health check
@@ -139,7 +139,7 @@ public interface IHealthcheckApiAsync : IApiAccessor
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (DeviceInfo)</returns>
         [Obsolete]
-        System.Threading.Tasks.Task<ApiResponse<DeviceInfo>> PingWithHttpInfoAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<DeviceInfo>> PingWithHttpInfoAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// License health check
         /// </summary>
@@ -150,7 +150,7 @@ public interface IHealthcheckApiAsync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task ReadyzAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task ReadyzAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// License health check
@@ -162,7 +162,7 @@ public interface IHealthcheckApiAsync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> ReadyzWithHttpInfoAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<Object>> ReadyzWithHttpInfoAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
         #endregion Asynchronous Operations
     }
 
@@ -382,7 +382,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>Healthcheck</returns>
-        public Healthcheck Healthz(string? xRequestID = default(string?))
+        public Healthcheck Healthz(string? xRequestID = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<Healthcheck> localVarResponse = HealthzWithHttpInfo(xRequestID);
             return localVarResponse.Data;
@@ -394,7 +394,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of Healthcheck</returns>
-        public Regula.DocumentReader.WebClient.Client.ApiResponse<Healthcheck> HealthzWithHttpInfo(string? xRequestID = default(string?))
+        public Regula.DocumentReader.WebClient.Client.ApiResponse<Healthcheck> HealthzWithHttpInfo(string? xRequestID = default)
         {
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
 
@@ -437,7 +437,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of Healthcheck</returns>
-        public async System.Threading.Tasks.Task<Healthcheck> HealthzAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Healthcheck> HealthzAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<Healthcheck> localVarResponse = await HealthzWithHttpInfoAsync(xRequestID, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -450,7 +450,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (Healthcheck)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<Healthcheck>> HealthzWithHttpInfoAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<Healthcheck>> HealthzWithHttpInfoAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
 
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
@@ -496,7 +496,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>DeviceInfo</returns>
         [Obsolete]
-        public DeviceInfo Ping(string? xRequestID = default(string?))
+        public DeviceInfo Ping(string? xRequestID = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<DeviceInfo> localVarResponse = PingWithHttpInfo(xRequestID);
             return localVarResponse.Data;
@@ -509,7 +509,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of DeviceInfo</returns>
         [Obsolete]
-        public Regula.DocumentReader.WebClient.Client.ApiResponse<DeviceInfo> PingWithHttpInfo(string? xRequestID = default(string?))
+        public Regula.DocumentReader.WebClient.Client.ApiResponse<DeviceInfo> PingWithHttpInfo(string? xRequestID = default)
         {
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
 
@@ -553,7 +553,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of DeviceInfo</returns>
         [Obsolete]
-        public async System.Threading.Tasks.Task<DeviceInfo> PingAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<DeviceInfo> PingAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<DeviceInfo> localVarResponse = await PingWithHttpInfoAsync(xRequestID, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -567,7 +567,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (DeviceInfo)</returns>
         [Obsolete]
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<DeviceInfo>> PingWithHttpInfoAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<DeviceInfo>> PingWithHttpInfoAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
 
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
@@ -612,7 +612,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns></returns>
-        public void Readyz(string? xRequestID = default(string?))
+        public void Readyz(string? xRequestID = default)
         {
             ReadyzWithHttpInfo(xRequestID);
         }
@@ -623,7 +623,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <exception cref="Regula.DocumentReader.WebClient.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public Regula.DocumentReader.WebClient.Client.ApiResponse<Object> ReadyzWithHttpInfo(string? xRequestID = default(string?))
+        public Regula.DocumentReader.WebClient.Client.ApiResponse<Object> ReadyzWithHttpInfo(string? xRequestID = default)
         {
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
 
@@ -665,7 +665,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task ReadyzAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task ReadyzAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
             await ReadyzWithHttpInfoAsync(xRequestID, cancellationToken).ConfigureAwait(false);
         }
@@ -677,7 +677,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<Object>> ReadyzWithHttpInfoAsync(string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<Object>> ReadyzWithHttpInfoAsync(string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
 
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
diff --git a/src/Regula.DocumentReader.WebClient/Api/ProcessApi.cs b/src/Regula.DocumentReader.WebClient/Api/ProcessApi.cs
index 22e1cc9..255bf53 100644
--- a/src/Regula.DocumentReader.WebClient/Api/ProcessApi.cs
+++ b/src/Regula.DocumentReader.WebClient/Api/ProcessApi.cs
@@ -34,7 +34,7 @@ public interface IProcessApiSync : IApiAccessor
         /// <param name="processRequest"></param>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ProcessResponse</returns>
-        ProcessResponse ApiProcess(ProcessRequest processRequest, string? xRequestID = default(string?));
+        ProcessResponse ApiProcess(ProcessRequest processRequest, string? xRequestID = default);
 
         /// <summary>
         /// Process list of documents images and return extracted data
@@ -46,7 +46,7 @@ public interface IProcessApiSync : IApiAccessor
         /// <param name="processRequest"></param>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of ProcessResponse</returns>
-        ApiResponse<ProcessResponse> ApiProcessWithHttpInfo(ProcessRequest processRequest, string? xRequestID = default(string?));
+        ApiResponse<ProcessResponse> ApiProcessWithHttpInfo(ProcessRequest processRequest, string? xRequestID = default);
         #endregion Synchronous Operations
     }
 
@@ -67,7 +67,7 @@ public interface IProcessApiAsync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ProcessResponse</returns>
-        System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync(ProcessRequest processRequest, string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync(ProcessRequest processRequest, string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Process list of documents images and return extracted data
@@ -80,7 +80,7 @@ public interface IProcessApiAsync : IApiAccessor
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (ProcessResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync(ProcessRequest processRequest, string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync(ProcessRequest processRequest, string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default);
         #endregion Asynchronous Operations
     }
 
@@ -301,7 +301,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="processRequest"></param>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ProcessResponse</returns>
-        public ProcessResponse ApiProcess(ProcessRequest processRequest, string? xRequestID = default(string?))
+        public ProcessResponse ApiProcess(ProcessRequest processRequest, string? xRequestID = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> localVarResponse = ApiProcessWithHttpInfo(processRequest, xRequestID);
             return localVarResponse.Data;
@@ -314,7 +314,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="processRequest"></param>
         /// <param name="xRequestID"> (optional)</param>
         /// <returns>ApiResponse of ProcessResponse</returns>
-        public Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> ApiProcessWithHttpInfo(ProcessRequest processRequest, string? xRequestID = default(string?))
+        public Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> ApiProcessWithHttpInfo(ProcessRequest processRequest, string? xRequestID = default)
         {
             // verify the required parameter 'processRequest' is set
             if (processRequest == null)
@@ -364,7 +364,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ProcessResponse</returns>
-        public async System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync(ProcessRequest processRequest, string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<ProcessResponse> ApiProcessAsync(ProcessRequest processRequest, string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> localVarResponse = await ApiProcessWithHttpInfoAsync(processRequest, xRequestID, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -378,7 +378,7 @@ public Regula.DocumentReader.WebClient.Client.ExceptionFactory ExceptionFactory
         /// <param name="xRequestID"> (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (ProcessResponse)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync(ProcessRequest processRequest, string? xRequestID = default(string?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse>> ApiProcessWithHttpInfoAsync(ProcessRequest processRequest, string? xRequestID = default, System.Threading.CancellationToken cancellationToken = default)
         {
             // verify the required parameter 'processRequest' is set
             if (processRequest == null)
diff --git a/src/Regula.DocumentReader.WebClient/Api/TransactionApi.cs b/src/Regula.DocumentReader.WebClient/Api/TransactionApi.cs
index 926adf5..2e418bf 100644
--- a/src/Regula.DocumentReader.WebClient/Api/TransactionApi.cs
+++ b/src/Regula.DocumentReader.WebClient/Api/TransactionApi.cs
@@ -128,7 +128,7 @@ public interface ITransactionApiSync : IApiAccessor
         /// <param name="transactionId">Transaction id</param>
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <returns>ProcessResponse</returns>
-        ProcessResponse ApiV2TransactionTransactionIdResultsGet(Guid transactionId, bool? withImages = default(bool?));
+        ProcessResponse ApiV2TransactionTransactionIdResultsGet(Guid transactionId, bool? withImages = default);
 
         /// <summary>
         /// Get Reprocess transaction result
@@ -140,7 +140,7 @@ public interface ITransactionApiSync : IApiAccessor
         /// <param name="transactionId">Transaction id</param>
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <returns>ApiResponse of ProcessResponse</returns>
-        ApiResponse<ProcessResponse> ApiV2TransactionTransactionIdResultsGetWithHttpInfo(Guid transactionId, bool? withImages = default(bool?));
+        ApiResponse<ProcessResponse> ApiV2TransactionTransactionIdResultsGetWithHttpInfo(Guid transactionId, bool? withImages = default);
         #endregion Synchronous Operations
     }
 
@@ -160,7 +160,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of Object</returns>
-        System.Threading.Tasks.Task<Object> ApiV2TagTagIdDeleteAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<Object> ApiV2TagTagIdDeleteAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Delete Reprocess transactions by tag
@@ -172,7 +172,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (Object)</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> ApiV2TagTagIdDeleteWithHttpInfoAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<Object>> ApiV2TagTagIdDeleteWithHttpInfoAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// Get transactions by tag
         /// </summary>
@@ -183,7 +183,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ListTransactionsByTagResponse</returns>
-        System.Threading.Tasks.Task<ListTransactionsByTagResponse> ApiV2TagTagIdTransactionsGetAsync(string tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ListTransactionsByTagResponse> ApiV2TagTagIdTransactionsGetAsync(string tagId, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Get transactions by tag
@@ -195,7 +195,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (ListTransactionsByTagResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<ListTransactionsByTagResponse>> ApiV2TagTagIdTransactionsGetWithHttpInfoAsync(string tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<ListTransactionsByTagResponse>> ApiV2TagTagIdTransactionsGetWithHttpInfoAsync(string tagId, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// Get Reprocess transaction file
         /// </summary>
@@ -207,7 +207,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="name">File name</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of FileParameter</returns>
-        System.Threading.Tasks.Task<FileParameter> ApiV2TransactionTransactionIdFileGetAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<FileParameter> ApiV2TransactionTransactionIdFileGetAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Get Reprocess transaction file
@@ -220,7 +220,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="name">File name</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (FileParameter)</returns>
-        System.Threading.Tasks.Task<ApiResponse<FileParameter>> ApiV2TransactionTransactionIdFileGetWithHttpInfoAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<FileParameter>> ApiV2TransactionTransactionIdFileGetWithHttpInfoAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// Get Reprocess transaction data
         /// </summary>
@@ -231,7 +231,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="transactionId">Transaction id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of TransactionProcessGetResponse</returns>
-        System.Threading.Tasks.Task<TransactionProcessGetResponse> ApiV2TransactionTransactionIdGetAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<TransactionProcessGetResponse> ApiV2TransactionTransactionIdGetAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Get Reprocess transaction data
@@ -243,7 +243,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="transactionId">Transaction id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (TransactionProcessGetResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<TransactionProcessGetResponse>> ApiV2TransactionTransactionIdGetWithHttpInfoAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<TransactionProcessGetResponse>> ApiV2TransactionTransactionIdGetWithHttpInfoAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// Reprocess
         /// </summary>
@@ -255,7 +255,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="transactionProcessRequest"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of TransactionProcessResult</returns>
-        System.Threading.Tasks.Task<TransactionProcessResult> ApiV2TransactionTransactionIdProcessPostAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<TransactionProcessResult> ApiV2TransactionTransactionIdProcessPostAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Reprocess
@@ -268,7 +268,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="transactionProcessRequest"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (TransactionProcessResult)</returns>
-        System.Threading.Tasks.Task<ApiResponse<TransactionProcessResult>> ApiV2TransactionTransactionIdProcessPostWithHttpInfoAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<TransactionProcessResult>> ApiV2TransactionTransactionIdProcessPostWithHttpInfoAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default);
         /// <summary>
         /// Get Reprocess transaction result
         /// </summary>
@@ -280,7 +280,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ProcessResponse</returns>
-        System.Threading.Tasks.Task<ProcessResponse> ApiV2TransactionTransactionIdResultsGetAsync(Guid transactionId, bool? withImages = default(bool?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ProcessResponse> ApiV2TransactionTransactionIdResultsGetAsync(Guid transactionId, bool? withImages = default, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Get Reprocess transaction result
@@ -293,7 +293,7 @@ public interface ITransactionApiAsync : IApiAccessor
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (ProcessResponse)</returns>
-        System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiV2TransactionTransactionIdResultsGetWithHttpInfoAsync(Guid transactionId, bool? withImages = default(bool?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<ProcessResponse>> ApiV2TransactionTransactionIdResultsGetWithHttpInfoAsync(Guid transactionId, bool? withImages = default, System.Threading.CancellationToken cancellationToken = default);
         #endregion Asynchronous Operations
     }
 
@@ -565,7 +565,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<Object> ApiV2TagTagIdD
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of Object</returns>
-        public async System.Threading.Tasks.Task<Object> ApiV2TagTagIdDeleteAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Object> ApiV2TagTagIdDeleteAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<Object> localVarResponse = await ApiV2TagTagIdDeleteWithHttpInfoAsync(tagId, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -578,7 +578,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<Object> ApiV2TagTagIdD
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (Object)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<Object>> ApiV2TagTagIdDeleteWithHttpInfoAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<Object>> ApiV2TagTagIdDeleteWithHttpInfoAsync(Guid tagId, System.Threading.CancellationToken cancellationToken = default)
         {
 
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
@@ -676,7 +676,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<ListTransactionsByTagR
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ListTransactionsByTagResponse</returns>
-        public async System.Threading.Tasks.Task<ListTransactionsByTagResponse> ApiV2TagTagIdTransactionsGetAsync(string tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<ListTransactionsByTagResponse> ApiV2TagTagIdTransactionsGetAsync(string tagId, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<ListTransactionsByTagResponse> localVarResponse = await ApiV2TagTagIdTransactionsGetWithHttpInfoAsync(tagId, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -689,7 +689,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<ListTransactionsByTagR
         /// <param name="tagId">Tag id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (ListTransactionsByTagResponse)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<ListTransactionsByTagResponse>> ApiV2TagTagIdTransactionsGetWithHttpInfoAsync(string tagId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<ListTransactionsByTagResponse>> ApiV2TagTagIdTransactionsGetWithHttpInfoAsync(string tagId, System.Threading.CancellationToken cancellationToken = default)
         {
             // verify the required parameter 'tagId' is set
             if (tagId == null)
@@ -795,7 +795,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<FileParameter> ApiV2Tr
         /// <param name="name">File name</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of FileParameter</returns>
-        public async System.Threading.Tasks.Task<FileParameter> ApiV2TransactionTransactionIdFileGetAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<FileParameter> ApiV2TransactionTransactionIdFileGetAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<FileParameter> localVarResponse = await ApiV2TransactionTransactionIdFileGetWithHttpInfoAsync(transactionId, name, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -809,7 +809,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<FileParameter> ApiV2Tr
         /// <param name="name">File name</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (FileParameter)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<FileParameter>> ApiV2TransactionTransactionIdFileGetWithHttpInfoAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<FileParameter>> ApiV2TransactionTransactionIdFileGetWithHttpInfoAsync(Guid transactionId, string name, System.Threading.CancellationToken cancellationToken = default)
         {
             // verify the required parameter 'name' is set
             if (name == null)
@@ -908,7 +908,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessGetR
         /// <param name="transactionId">Transaction id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of TransactionProcessGetResponse</returns>
-        public async System.Threading.Tasks.Task<TransactionProcessGetResponse> ApiV2TransactionTransactionIdGetAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<TransactionProcessGetResponse> ApiV2TransactionTransactionIdGetAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessGetResponse> localVarResponse = await ApiV2TransactionTransactionIdGetWithHttpInfoAsync(transactionId, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -921,7 +921,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessGetR
         /// <param name="transactionId">Transaction id</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (TransactionProcessGetResponse)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessGetResponse>> ApiV2TransactionTransactionIdGetWithHttpInfoAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessGetResponse>> ApiV2TransactionTransactionIdGetWithHttpInfoAsync(Guid transactionId, System.Threading.CancellationToken cancellationToken = default)
         {
 
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
@@ -1024,7 +1024,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResu
         /// <param name="transactionProcessRequest"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of TransactionProcessResult</returns>
-        public async System.Threading.Tasks.Task<TransactionProcessResult> ApiV2TransactionTransactionIdProcessPostAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<TransactionProcessResult> ApiV2TransactionTransactionIdProcessPostAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResult> localVarResponse = await ApiV2TransactionTransactionIdProcessPostWithHttpInfoAsync(transactionId, transactionProcessRequest, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -1038,7 +1038,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResu
         /// <param name="transactionProcessRequest"></param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (TransactionProcessResult)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResult>> ApiV2TransactionTransactionIdProcessPostWithHttpInfoAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResult>> ApiV2TransactionTransactionIdProcessPostWithHttpInfoAsync(Guid transactionId, TransactionProcessRequest transactionProcessRequest, System.Threading.CancellationToken cancellationToken = default)
         {
             // verify the required parameter 'transactionProcessRequest' is set
             if (transactionProcessRequest == null)
@@ -1087,7 +1087,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResu
         /// <param name="transactionId">Transaction id</param>
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <returns>ProcessResponse</returns>
-        public ProcessResponse ApiV2TransactionTransactionIdResultsGet(Guid transactionId, bool? withImages = default(bool?))
+        public ProcessResponse ApiV2TransactionTransactionIdResultsGet(Guid transactionId, bool? withImages = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> localVarResponse = ApiV2TransactionTransactionIdResultsGetWithHttpInfo(transactionId, withImages);
             return localVarResponse.Data;
@@ -1100,7 +1100,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResu
         /// <param name="transactionId">Transaction id</param>
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <returns>ApiResponse of ProcessResponse</returns>
-        public Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> ApiV2TransactionTransactionIdResultsGetWithHttpInfo(Guid transactionId, bool? withImages = default(bool?))
+        public Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> ApiV2TransactionTransactionIdResultsGetWithHttpInfo(Guid transactionId, bool? withImages = default)
         {
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
 
@@ -1145,7 +1145,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResu
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ProcessResponse</returns>
-        public async System.Threading.Tasks.Task<ProcessResponse> ApiV2TransactionTransactionIdResultsGetAsync(Guid transactionId, bool? withImages = default(bool?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<ProcessResponse> ApiV2TransactionTransactionIdResultsGetAsync(Guid transactionId, bool? withImages = default, System.Threading.CancellationToken cancellationToken = default)
         {
             Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse> localVarResponse = await ApiV2TransactionTransactionIdResultsGetWithHttpInfoAsync(transactionId, withImages, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -1159,7 +1159,7 @@ public Regula.DocumentReader.WebClient.Client.ApiResponse<TransactionProcessResu
         /// <param name="withImages">With base64 images or url (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (ProcessResponse)</returns>
-        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse>> ApiV2TransactionTransactionIdResultsGetWithHttpInfoAsync(Guid transactionId, bool? withImages = default(bool?), System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Regula.DocumentReader.WebClient.Client.ApiResponse<ProcessResponse>> ApiV2TransactionTransactionIdResultsGetWithHttpInfoAsync(Guid transactionId, bool? withImages = default, System.Threading.CancellationToken cancellationToken = default)
         {
 
             Regula.DocumentReader.WebClient.Client.RequestOptions localVarRequestOptions = new Regula.DocumentReader.WebClient.Client.RequestOptions();
diff --git a/src/Regula.DocumentReader.WebClient/Client/ApiClient.cs b/src/Regula.DocumentReader.WebClient/Client/ApiClient.cs
index 259160f..cc2e6d6 100644
--- a/src/Regula.DocumentReader.WebClient/Client/ApiClient.cs
+++ b/src/Regula.DocumentReader.WebClient/Client/ApiClient.cs
@@ -474,7 +474,7 @@ private ApiResponse<T> Exec<T>(HttpRequestMessage req, IReadableConfiguration co
 
         private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
             IReadableConfiguration configuration,
-            System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+            System.Threading.CancellationToken cancellationToken = default)
         {
             CancellationTokenSource timeoutTokenSource = null;
             CancellationTokenSource finalTokenSource = null;
@@ -536,7 +536,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
 
                 if (!response.IsSuccessStatusCode)
                 {
-                    return await ToApiResponse<T>(response, default(T), req.RequestUri).ConfigureAwait(false);
+                    return await ToApiResponse<T>(response, default, req.RequestUri).ConfigureAwait(false);
                 }
 
                 object responseData = await deserializer.Deserialize<T>(response).ConfigureAwait(false);
@@ -588,7 +588,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> GetAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> GetAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(HttpMethod.Get, path, options, config), config, cancellationToken);
@@ -603,7 +603,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> PostAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> PostAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(HttpMethod.Post, path, options, config), config, cancellationToken);
@@ -618,7 +618,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> PutAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> PutAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(HttpMethod.Put, path, options, config), config, cancellationToken);
@@ -633,7 +633,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> DeleteAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> DeleteAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(HttpMethod.Delete, path, options, config), config, cancellationToken);
@@ -648,7 +648,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> HeadAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> HeadAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(HttpMethod.Head, path, options, config), config, cancellationToken);
@@ -663,7 +663,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> OptionsAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> OptionsAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(HttpMethod.Options, path, options, config), config, cancellationToken);
@@ -678,7 +678,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
         /// GlobalConfiguration has been done before calling this method.</param>
         /// <param name="cancellationToken">Token that enables callers to cancel the request.</param>
         /// <returns>A Task containing ApiResponse</returns>
-        public Task<ApiResponse<T>> PatchAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public Task<ApiResponse<T>> PatchAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default)
         {
             var config = configuration ?? GlobalConfiguration.Instance;
             return ExecAsync<T>(NewRequest(new HttpMethod("PATCH"), path, options, config), config, cancellationToken);
diff --git a/src/Regula.DocumentReader.WebClient/Client/Configuration.cs b/src/Regula.DocumentReader.WebClient/Client/Configuration.cs
index 21fa903..b081a47 100644
--- a/src/Regula.DocumentReader.WebClient/Client/Configuration.cs
+++ b/src/Regula.DocumentReader.WebClient/Client/Configuration.cs
@@ -514,7 +514,7 @@ private string GetServerUrl(IList<IReadOnlyDictionary<string, object>> servers,
 
                     if (inputVariables.ContainsKey(variable.Key))
                     {
-                        if (((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
+                        if (!serverVariables.ContainsKey("enum_values") || ((List<string>)serverVariables["enum_values"]).Contains(inputVariables[variable.Key]))
                         {
                             url = url.Replace("{" + variable.Key + "}", inputVariables[variable.Key]);
                         }
diff --git a/src/Regula.DocumentReader.WebClient/Client/IAsynchronousClient.cs b/src/Regula.DocumentReader.WebClient/Client/IAsynchronousClient.cs
index 8f2fbf2..a98680d 100644
--- a/src/Regula.DocumentReader.WebClient/Client/IAsynchronousClient.cs
+++ b/src/Regula.DocumentReader.WebClient/Client/IAsynchronousClient.cs
@@ -29,7 +29,7 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> GetAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> GetAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the POST http verb.
@@ -40,7 +40,7 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> PostAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> PostAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the PUT http verb.
@@ -51,7 +51,7 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> PutAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> PutAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the DELETE http verb.
@@ -62,7 +62,7 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> DeleteAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> DeleteAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the HEAD http verb.
@@ -73,7 +73,7 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> HeadAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> HeadAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the OPTIONS http verb.
@@ -84,7 +84,7 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> OptionsAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> OptionsAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Executes a non-blocking call to some <paramref name="path"/> using the PATCH http verb.
@@ -95,6 +95,6 @@ public interface IAsynchronousClient
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <typeparam name="T">The return type.</typeparam>
         /// <returns>A task eventually representing the response data, decorated with <see cref="ApiResponse{T}"/></returns>
-        Task<ApiResponse<T>> PatchAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        Task<ApiResponse<T>> PatchAsync<T>(string path, RequestOptions options, IReadableConfiguration configuration = null, System.Threading.CancellationToken cancellationToken = default);
     }
 }
diff --git a/src/Regula.DocumentReader.WebClient/Client/RetryConfiguration.cs b/src/Regula.DocumentReader.WebClient/Client/RetryConfiguration.cs
index edd5e59..1d5522f 100644
--- a/src/Regula.DocumentReader.WebClient/Client/RetryConfiguration.cs
+++ b/src/Regula.DocumentReader.WebClient/Client/RetryConfiguration.cs
@@ -21,11 +21,11 @@ public static class RetryConfiguration
         /// <summary>
         /// Retry policy
         /// </summary>
-        public static Policy<HttpResponseMessage> RetryPolicy { get; set; }
+        public static ISyncPolicy<HttpResponseMessage> RetryPolicy { get; set; }
 
         /// <summary>
         /// Async retry policy
         /// </summary>
-        public static AsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
+        public static IAsyncPolicy<HttpResponseMessage> AsyncRetryPolicy { get; set; }
     }
 }
diff --git a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs
index 51b2a9c..2f0426f 100644
--- a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs
+++ b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs
@@ -56,7 +56,7 @@ protected EncryptedRCLItem() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@2d970d48</example>
+        <example>[B@56f1b55a</example>
         */
         [DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)]
         public byte[] EncryptedRCL { get; set; }
diff --git a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs
index 301fd60..a708662 100644
--- a/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs
+++ b/src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs
@@ -62,7 +62,7 @@ protected EncryptedRCLResult() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@2d970d48</example>
+        <example>[B@56f1b55a</example>
         */
         [DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)]
         public byte[] EncryptedRCL { get; set; }
diff --git a/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs b/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs
index 1daac32..bea1e75 100644
--- a/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs
+++ b/src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs
@@ -56,7 +56,7 @@ protected LicenseItem() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@2065118c</example>
+        <example>[B@6299255d</example>
         */
         [DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)]
         public byte[] License { get; set; }
diff --git a/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs b/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs
index 9847f1b..99e8335 100644
--- a/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs
+++ b/src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs
@@ -62,7 +62,7 @@ protected LicenseResult() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@2065118c</example>
+        <example>[B@6299255d</example>
         */
         [DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)]
         public byte[] License { get; set; }
diff --git a/src/Regula.DocumentReader.WebClient/Model/ParsingNotificationCodes.cs b/src/Regula.DocumentReader.WebClient/Model/ParsingNotificationCodes.cs
index dc02d5f..8e3828d 100644
--- a/src/Regula.DocumentReader.WebClient/Model/ParsingNotificationCodes.cs
+++ b/src/Regula.DocumentReader.WebClient/Model/ParsingNotificationCodes.cs
@@ -1140,7 +1140,17 @@ public enum ParsingNotificationCodes: long
         /// <summary>
         /// Enum ntfLDS_ICAO_Certificate_MRZ_Country_NonMatching for value: 2415919698
         /// </summary>
-        ntfLDS_ICAO_Certificate_MRZ_Country_NonMatching = 2415919698
+        ntfLDS_ICAO_Certificate_MRZ_Country_NonMatching = 2415919698,
+
+        /// <summary>
+        /// Enum ntfLDS_ICAO_Certificate_Issuer_CountryNonUpperCase for value: 2415919699
+        /// </summary>
+        ntfLDS_ICAO_Certificate_Issuer_CountryNonUpperCase = 2415919699,
+
+        /// <summary>
+        /// Enum ntfLDS_ICAO_Certificate_Subject_CountryNonUpperCase for value: 2415919700
+        /// </summary>
+        ntfLDS_ICAO_Certificate_Subject_CountryNonUpperCase = 2415919700
     }
 
 }
diff --git a/update-models.sh b/update-models.sh
index e45c062..f69f92d 100755
--- a/update-models.sh
+++ b/update-models.sh
@@ -5,7 +5,7 @@ DOCS_DEFINITION_FOLDER="${PWD}/../DocumentReader-web-openapi"  \
 && docker run --user "$(id -u):$(id -g)" --rm \
 -v "${PWD}:/client" \
 -v "${DOCS_DEFINITION_FOLDER}:/definitions" \
-openapitools/openapi-generator-cli:v7.12.0 generate \
+openapitools/openapi-generator-cli:v7.13.0 generate \
 -g csharp \
 -i /definitions/index.yml \
 -o /client/ --openapi-normalizer REF_AS_PARENT_IN_ALLOF=true \