diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ContactsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ContactsServiceImpl.java
index 713266dff..9850bd462 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ContactsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ContactsServiceImpl.java
@@ -46,6 +46,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class ContactsServiceImpl
@@ -84,11 +85,15 @@ public ContactsListResponse list(ContactsListQueryParameters queryParameter) thr
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ContactsListResponse _fetchListPage(
-      ContactsListQueryParameters queryParameter, HttpRequest httpRequest) throws ApiException {
+      Function<ContactsListQueryParameters, HttpRequest> requestBuilder,
+      ContactsListQueryParameters queryParameter,
+      HttpRequest httpRequest)
+      throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
             this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest);
@@ -104,10 +109,10 @@ private ContactsListResponse _fetchListPage(
           ContactsListQueryParameters.builder(queryParameter).setPageToken(nextToken).build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken) ? listRequestBuilder(nextParameters) : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new ContactsListResponse(
-          () -> _fetchListPage(nextParameters, nextHttpRequest),
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getContacts(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
@@ -480,11 +485,16 @@ public IdentityConflictsListResponse listIdentityConflicts(
     LOGGER.finest("[listIdentityConflicts]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listIdentityConflictsRequestBuilder(queryParameter);
-    return _fetchListIdentityConflictsPage(queryParameter, httpRequest);
+    return _fetchListIdentityConflictsPage(
+        (queryParameters) -> listIdentityConflictsRequestBuilder(queryParameters),
+        queryParameter,
+        httpRequest);
   }
 
   private IdentityConflictsListResponse _fetchListIdentityConflictsPage(
-      IdentityConflictsListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<IdentityConflictsListQueryParameters, HttpRequest> requestBuilder,
+      IdentityConflictsListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -504,12 +514,10 @@ private IdentityConflictsListResponse _fetchListIdentityConflictsPage(
               .build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken)
-              ? listIdentityConflictsRequestBuilder(nextParameters)
-              : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new IdentityConflictsListResponse(
-          () -> _fetchListIdentityConflictsPage(nextParameters, nextHttpRequest),
+          () -> _fetchListIdentityConflictsPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getConflicts(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationsServiceImpl.java
index dae6bdfb0..1387c112a 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationsServiceImpl.java
@@ -45,6 +45,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class ConversationsServiceImpl
@@ -84,11 +85,14 @@ public ConversationsListResponse list(ConversationsListQueryParameters queryPara
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ConversationsListResponse _fetchListPage(
-      ConversationsListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<ConversationsListQueryParameters, HttpRequest> requestBuilder,
+      ConversationsListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -105,10 +109,10 @@ private ConversationsListResponse _fetchListPage(
           ConversationsListQueryParameters.builder(queryParameter).setPageToken(nextToken).build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken) ? listRequestBuilder(nextParameters) : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new ConversationsListResponse(
-          () -> _fetchListPage(nextParameters, nextHttpRequest),
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getConversations(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
@@ -563,11 +567,16 @@ public RecentConversationsListResponse listRecent(
     LOGGER.finest("[listRecent]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRecentRequestBuilder(queryParameter);
-    return _fetchListRecentPage(queryParameter, httpRequest);
+    return _fetchListRecentPage(
+        (queryParameters) -> listRecentRequestBuilder(queryParameters),
+        queryParameter,
+        httpRequest);
   }
 
   private RecentConversationsListResponse _fetchListRecentPage(
-      RecentConversationsListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<RecentConversationsListQueryParameters, HttpRequest> requestBuilder,
+      RecentConversationsListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -587,10 +596,10 @@ private RecentConversationsListResponse _fetchListRecentPage(
               .build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken) ? listRecentRequestBuilder(nextParameters) : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new RecentConversationsListResponse(
-          () -> _fetchListRecentPage(nextParameters, nextHttpRequest),
+          () -> _fetchListRecentPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getConversations(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventsServiceImpl.java
index e797c5dbc..a929ece67 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/EventsServiceImpl.java
@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class EventsServiceImpl implements com.sinch.sdk.domains.conversation.api.v1.EventsService {
@@ -76,11 +77,15 @@ public EventsListResponse list(EventsListQueryParameters queryParameter) throws
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private EventsListResponse _fetchListPage(
-      EventsListQueryParameters queryParameter, HttpRequest httpRequest) throws ApiException {
+      Function<EventsListQueryParameters, HttpRequest> requestBuilder,
+      EventsListQueryParameters queryParameter,
+      HttpRequest httpRequest)
+      throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
             this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest);
@@ -96,10 +101,10 @@ private EventsListResponse _fetchListPage(
           EventsListQueryParameters.builder(queryParameter).setPageToken(nextToken).build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken) ? listRequestBuilder(nextParameters) : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new EventsListResponse(
-          () -> _fetchListPage(nextParameters, nextHttpRequest),
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getEvents(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/MessagesServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/MessagesServiceImpl.java
index 390b2cf0c..b152a134a 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/MessagesServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/MessagesServiceImpl.java
@@ -54,6 +54,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class MessagesServiceImpl
@@ -92,11 +93,15 @@ public MessagesListResponse list(MessagesListQueryParameters queryParameter) thr
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private MessagesListResponse _fetchListPage(
-      MessagesListQueryParameters queryParameter, HttpRequest httpRequest) throws ApiException {
+      Function<MessagesListQueryParameters, HttpRequest> requestBuilder,
+      MessagesListQueryParameters queryParameter,
+      HttpRequest httpRequest)
+      throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
             this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest);
@@ -112,10 +117,10 @@ private MessagesListResponse _fetchListPage(
           MessagesListQueryParameters.builder(queryParameter).setPageToken(nextToken).build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken) ? listRequestBuilder(nextParameters) : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new MessagesListResponse(
-          () -> _fetchListPage(nextParameters, nextHttpRequest),
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getMessages(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
@@ -438,11 +443,16 @@ public MessagesListResponse listLastMessagesByChannelIdentity(
         "[listLastMessagesByChannelIdentity]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listLastMessagesByChannelIdentityRequestBuilder(queryParameter);
-    return _fetchListLastMessagesByChannelIdentityPage(queryParameter, httpRequest);
+    return _fetchListLastMessagesByChannelIdentityPage(
+        (queryParameters) -> listLastMessagesByChannelIdentityRequestBuilder(queryParameters),
+        queryParameter,
+        httpRequest);
   }
 
   private MessagesListResponse _fetchListLastMessagesByChannelIdentityPage(
-      LastMessagesByChannelIdentityListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<LastMessagesByChannelIdentityListQueryParameters, HttpRequest> requestBuilder,
+      LastMessagesByChannelIdentityListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -461,12 +471,12 @@ private MessagesListResponse _fetchListLastMessagesByChannelIdentityPage(
               .build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken)
-              ? listLastMessagesByChannelIdentityRequestBuilder(nextParameters)
-              : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new MessagesListResponse(
-          () -> _fetchListLastMessagesByChannelIdentityPage(nextParameters, nextHttpRequest),
+          () ->
+              _fetchListLastMessagesByChannelIdentityPage(
+                  requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getMessages(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java
index 024c95949..ca1abf239 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java
@@ -37,6 +37,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class TemplatesV2ServiceImpl
@@ -339,11 +340,17 @@ public TranslationsV2ListResponse listTranslations(
             + queryParameter);
 
     HttpRequest httpRequest = listTranslationsRequestBuilder(templateId, queryParameter);
-    return _fetchListTranslationsPage(queryParameter, httpRequest);
+    return _fetchListTranslationsPage(
+        (queryParameters) -> listTranslationsRequestBuilder(templateId, queryParameters),
+        queryParameter,
+        httpRequest);
   }
 
   private TranslationsV2ListResponse _fetchListTranslationsPage(
-      ListTranslationsQueryParameters queryParameter, HttpRequest httpRequest) throws ApiException {
+      Function<ListTranslationsQueryParameters, HttpRequest> requestBuilder,
+      ListTranslationsQueryParameters queryParameter,
+      HttpRequest httpRequest)
+      throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
             this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest);
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceImpl.java
index 21d74b1d4..e8a54731a 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/ActiveNumberServiceImpl.java
@@ -41,6 +41,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class ActiveNumberServiceImpl
@@ -84,11 +85,14 @@ public ActiveNumbersListResponse list(ActiveNumbersListQueryParameters queryPara
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ActiveNumbersListResponse _fetchListPage(
-      ActiveNumbersListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<ActiveNumbersListQueryParameters, HttpRequest> requestBuilder,
+      ActiveNumbersListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -105,10 +109,10 @@ private ActiveNumbersListResponse _fetchListPage(
           ActiveNumbersListQueryParameters.builder(queryParameter).setPageToken(nextToken).build();
 
       final HttpRequest nextHttpRequest =
-          !StringUtil.isEmpty(nextToken) ? listRequestBuilder(nextParameters) : null;
+          !StringUtil.isEmpty(nextToken) ? requestBuilder.apply(nextParameters) : null;
 
       return new ActiveNumbersListResponse(
-          () -> _fetchListPage(nextParameters, nextHttpRequest),
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest),
           new Page<>(deserialized.getActiveNumbers(), new PageNavigator<>(nextHttpRequest)));
     }
     // fallback to default errors handling:
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceImpl.java
index d12668042..8e8d48791 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableNumberServiceImpl.java
@@ -38,6 +38,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class AvailableNumberServiceImpl
@@ -284,11 +285,16 @@ public AvailableNumbersListResponse searchForAvailableNumbers(
     LOGGER.finest("[searchForAvailableNumbers]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = searchForAvailableNumbersRequestBuilder(queryParameter);
-    return _fetchSearchForAvailableNumbersPage(queryParameter, httpRequest);
+    return _fetchSearchForAvailableNumbersPage(
+        (queryParameters) -> searchForAvailableNumbersRequestBuilder(queryParameters),
+        queryParameter,
+        httpRequest);
   }
 
   private AvailableNumbersListResponse _fetchSearchForAvailableNumbersPage(
-      AvailableNumbersListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<AvailableNumbersListQueryParameters, HttpRequest> requestBuilder,
+      AvailableNumbersListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableRegionsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableRegionsServiceImpl.java
index 8e2ce0c64..2d94e25a3 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableRegionsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/numbers/api/v1/adapters/AvailableRegionsServiceImpl.java
@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class AvailableRegionsServiceImpl
@@ -74,11 +75,14 @@ public AvailableRegionsListResponse list(AvailableRegionsListQueryParameters que
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private AvailableRegionsListResponse _fetchListPage(
-      AvailableRegionsListQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<AvailableRegionsListQueryParameters, HttpRequest> requestBuilder,
+      AvailableRegionsListQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/BatchesServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/BatchesServiceImpl.java
index 660f9866a..427fe7d8c 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/BatchesServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/BatchesServiceImpl.java
@@ -42,6 +42,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class BatchesServiceImpl implements com.sinch.sdk.domains.sms.api.v1.BatchesService {
@@ -79,11 +80,15 @@ public ListBatchesResponse list(ListBatchesQueryParameters queryParameter) throw
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ListBatchesResponse _fetchListPage(
-      ListBatchesQueryParameters queryParameter, HttpRequest httpRequest) throws ApiException {
+      Function<ListBatchesQueryParameters, HttpRequest> requestBuilder,
+      ListBatchesQueryParameters queryParameter,
+      HttpRequest httpRequest)
+      throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
             this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest);
@@ -113,9 +118,10 @@ private ListBatchesResponse _fetchListPage(
           ListBatchesQueryParameters.builder(queryParameter).setPage(nextPage).build();
 
       final HttpRequest nextHttpRequest =
-          nextPage != null ? listRequestBuilder(nextParameters) : null;
+          nextPage != null ? requestBuilder.apply(nextParameters) : null;
 
-      return new ListBatchesResponse(() -> _fetchListPage(nextParameters, nextHttpRequest), page);
+      return new ListBatchesResponse(
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest), page);
     }
     // fallback to default errors handling:
     // all error cases definition are not required from specs: will try some "hardcoded" content
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/DeliveryReportsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/DeliveryReportsServiceImpl.java
index 1624a0fd3..4887acfcb 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/DeliveryReportsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/DeliveryReportsServiceImpl.java
@@ -39,6 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class DeliveryReportsServiceImpl
@@ -78,11 +79,14 @@ public ListDeliveryReportsResponse list(ListDeliveryReportsQueryParameters query
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ListDeliveryReportsResponse _fetchListPage(
-      ListDeliveryReportsQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<ListDeliveryReportsQueryParameters, HttpRequest> requestBuilder,
+      ListDeliveryReportsQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -113,10 +117,10 @@ private ListDeliveryReportsResponse _fetchListPage(
           ListDeliveryReportsQueryParameters.builder(queryParameter).setPage(nextPage).build();
 
       final HttpRequest nextHttpRequest =
-          nextPage != null ? listRequestBuilder(nextParameters) : null;
+          nextPage != null ? requestBuilder.apply(nextParameters) : null;
 
       return new ListDeliveryReportsResponse(
-          () -> _fetchListPage(nextParameters, nextHttpRequest), page);
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest), page);
     }
     // fallback to default errors handling:
     // all error cases definition are not required from specs: will try some "hardcoded" content
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/GroupsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/GroupsServiceImpl.java
index 790fd9a69..f2e103992 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/GroupsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/GroupsServiceImpl.java
@@ -38,6 +38,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class GroupsServiceImpl implements com.sinch.sdk.domains.sms.api.v1.GroupsService {
@@ -75,11 +76,15 @@ public ListGroupsResponse list(ListGroupsQueryParameters queryParameter) throws
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ListGroupsResponse _fetchListPage(
-      ListGroupsQueryParameters queryParameter, HttpRequest httpRequest) throws ApiException {
+      Function<ListGroupsQueryParameters, HttpRequest> requestBuilder,
+      ListGroupsQueryParameters queryParameter,
+      HttpRequest httpRequest)
+      throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
             this.serverConfiguration, this.authManagersByOasSecuritySchemes, httpRequest);
@@ -109,9 +114,10 @@ private ListGroupsResponse _fetchListPage(
           ListGroupsQueryParameters.builder(queryParameter).setPage(nextPage).build();
 
       final HttpRequest nextHttpRequest =
-          nextPage != null ? listRequestBuilder(nextParameters) : null;
+          nextPage != null ? requestBuilder.apply(nextParameters) : null;
 
-      return new ListGroupsResponse(() -> _fetchListPage(nextParameters, nextHttpRequest), page);
+      return new ListGroupsResponse(
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest), page);
     }
     // fallback to default errors handling:
     // all error cases definition are not required from specs: will try some "hardcoded" content
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/InboundsServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/InboundsServiceImpl.java
index 6a24d5b3b..7d2193d1a 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/InboundsServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/sms/api/v1/adapters/InboundsServiceImpl.java
@@ -37,6 +37,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.logging.Logger;
 
 public class InboundsServiceImpl implements com.sinch.sdk.domains.sms.api.v1.InboundsService {
@@ -75,11 +76,14 @@ public ListInboundsResponse list(ListInboundMessagesQueryParameters queryParamet
     LOGGER.finest("[list]" + " " + "queryParameter: " + queryParameter);
 
     HttpRequest httpRequest = listRequestBuilder(queryParameter);
-    return _fetchListPage(queryParameter, httpRequest);
+    return _fetchListPage(
+        (queryParameters) -> listRequestBuilder(queryParameters), queryParameter, httpRequest);
   }
 
   private ListInboundsResponse _fetchListPage(
-      ListInboundMessagesQueryParameters queryParameter, HttpRequest httpRequest)
+      Function<ListInboundMessagesQueryParameters, HttpRequest> requestBuilder,
+      ListInboundMessagesQueryParameters queryParameter,
+      HttpRequest httpRequest)
       throws ApiException {
     HttpResponse response =
         httpClient.invokeAPI(
@@ -110,9 +114,10 @@ private ListInboundsResponse _fetchListPage(
           ListInboundMessagesQueryParameters.builder(queryParameter).setPage(nextPage).build();
 
       final HttpRequest nextHttpRequest =
-          nextPage != null ? listRequestBuilder(nextParameters) : null;
+          nextPage != null ? requestBuilder.apply(nextParameters) : null;
 
-      return new ListInboundsResponse(() -> _fetchListPage(nextParameters, nextHttpRequest), page);
+      return new ListInboundsResponse(
+          () -> _fetchListPage(requestBuilder, nextParameters, nextHttpRequest), page);
     }
     // fallback to default errors handling:
     // all error cases definition are not required from specs: will try some "hardcoded" content