diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 868fddef2..1917eb714 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,5 +14,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           commit: main
-          tag: 2.5.1
+          tag: 2.5.2
 
diff --git a/package.json b/package.json
index 937ef4788..4cded0064 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@apideck/php",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Apideck PHP SDK",
   "keywords": [
     "apideck",
diff --git a/src/gen/lib/Api/AccountingApi.php b/src/gen/lib/Api/AccountingApi.php
index f8c181ada..cfd6e4c1f 100644
--- a/src/gen/lib/Api/AccountingApi.php
+++ b/src/gen/lib/Api/AccountingApi.php
@@ -459,6 +459,7 @@ public function balanceSheetOneRequest($x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -469,7 +470,23 @@ public function balanceSheetOneRequest($x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -482,6 +499,7 @@ public function balanceSheetOneRequest($x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -492,7 +510,23 @@ public function balanceSheetOneRequest($x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -505,6 +539,7 @@ public function balanceSheetOneRequest($x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -515,7 +550,23 @@ public function balanceSheetOneRequest($x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -948,6 +999,7 @@ public function billsAddRequest($bill, $raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -958,7 +1010,23 @@ public function billsAddRequest($bill, $raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1418,6 +1486,7 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1428,7 +1497,23 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1441,6 +1526,7 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1451,7 +1537,23 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1464,6 +1566,7 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1474,7 +1577,23 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1487,6 +1606,7 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1497,7 +1617,23 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1510,6 +1646,7 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1520,7 +1657,23 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1533,6 +1686,7 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1543,7 +1697,23 @@ public function billsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1976,6 +2146,7 @@ public function billsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1986,7 +2157,23 @@ public function billsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2432,6 +2619,7 @@ public function billsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2442,7 +2630,23 @@ public function billsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2455,6 +2659,7 @@ public function billsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2465,7 +2670,23 @@ public function billsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2917,6 +3138,7 @@ public function billsUpdateRequest($id, $bill, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2927,7 +3149,23 @@ public function billsUpdateRequest($id, $bill, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3368,6 +3606,7 @@ public function companyInfoOneRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3378,7 +3617,23 @@ public function companyInfoOneRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3391,6 +3646,7 @@ public function companyInfoOneRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3401,7 +3657,23 @@ public function companyInfoOneRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3834,6 +4106,7 @@ public function creditNotesAddRequest($credit_note, $raw = false, $x_apideck_con
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3844,7 +4117,23 @@ public function creditNotesAddRequest($credit_note, $raw = false, $x_apideck_con
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4299,6 +4588,7 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4309,7 +4599,23 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4322,6 +4628,7 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4332,7 +4639,23 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4345,6 +4668,7 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4355,7 +4679,23 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4368,6 +4708,7 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4378,7 +4719,23 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4391,6 +4748,7 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4401,7 +4759,23 @@ public function creditNotesAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4834,6 +5208,7 @@ public function creditNotesDeleteRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4844,7 +5219,23 @@ public function creditNotesDeleteRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5290,6 +5681,7 @@ public function creditNotesOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5300,7 +5692,23 @@ public function creditNotesOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5313,6 +5721,7 @@ public function creditNotesOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5323,7 +5732,23 @@ public function creditNotesOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5775,6 +6200,7 @@ public function creditNotesUpdateRequest($id, $credit_note, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5785,7 +6211,23 @@ public function creditNotesUpdateRequest($id, $credit_note, $x_apideck_consumer_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6232,6 +6674,7 @@ public function customersAddRequest($customer, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6242,7 +6685,23 @@ public function customersAddRequest($customer, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6702,6 +7161,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6712,7 +7172,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6725,6 +7201,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6735,7 +7212,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6748,6 +7241,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6758,7 +7252,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6771,6 +7281,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6781,7 +7292,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6794,6 +7321,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6804,7 +7332,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6817,6 +7361,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6827,7 +7372,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7260,6 +7821,7 @@ public function customersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7270,7 +7832,23 @@ public function customersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7716,6 +8294,7 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7726,7 +8305,23 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7739,6 +8334,7 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7749,7 +8345,23 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8201,6 +8813,7 @@ public function customersUpdateRequest($id, $customer, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8211,7 +8824,23 @@ public function customersUpdateRequest($id, $customer, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8658,6 +9287,7 @@ public function invoiceItemsAddRequest($invoice_item, $raw = false, $x_apideck_c
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8668,7 +9298,23 @@ public function invoiceItemsAddRequest($invoice_item, $raw = false, $x_apideck_c
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9128,6 +9774,7 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9138,7 +9785,23 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9151,6 +9814,7 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9161,7 +9825,23 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9174,6 +9854,7 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9184,7 +9865,23 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9197,6 +9894,7 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9207,7 +9905,23 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9220,6 +9934,7 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9230,7 +9945,23 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9243,6 +9974,7 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9253,7 +9985,23 @@ public function invoiceItemsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9686,6 +10434,7 @@ public function invoiceItemsDeleteRequest($id, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9696,7 +10445,23 @@ public function invoiceItemsDeleteRequest($id, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10142,6 +10907,7 @@ public function invoiceItemsOneRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10152,7 +10918,23 @@ public function invoiceItemsOneRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10165,6 +10947,7 @@ public function invoiceItemsOneRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10175,7 +10958,23 @@ public function invoiceItemsOneRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10627,6 +11426,7 @@ public function invoiceItemsUpdateRequest($id, $invoice_item, $x_apideck_consume
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10637,7 +11437,23 @@ public function invoiceItemsUpdateRequest($id, $invoice_item, $x_apideck_consume
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11084,6 +11900,7 @@ public function invoicesAddRequest($invoice, $raw = false, $x_apideck_consumer_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11094,7 +11911,23 @@ public function invoicesAddRequest($invoice, $raw = false, $x_apideck_consumer_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11554,6 +12387,7 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11564,7 +12398,23 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11577,6 +12427,7 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11587,7 +12438,23 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11600,6 +12467,7 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11610,7 +12478,23 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11623,6 +12507,7 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11633,7 +12518,23 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11646,6 +12547,7 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11656,7 +12558,23 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11669,6 +12587,7 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11679,7 +12598,23 @@ public function invoicesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12112,6 +13047,7 @@ public function invoicesDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12122,7 +13058,23 @@ public function invoicesDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12568,6 +13520,7 @@ public function invoicesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12578,7 +13531,23 @@ public function invoicesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12591,6 +13560,7 @@ public function invoicesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12601,7 +13571,23 @@ public function invoicesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13053,6 +14039,7 @@ public function invoicesUpdateRequest($id, $invoice, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13063,7 +14050,23 @@ public function invoicesUpdateRequest($id, $invoice, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13510,6 +14513,7 @@ public function journalEntriesAddRequest($journal_entry, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13520,7 +14524,23 @@ public function journalEntriesAddRequest($journal_entry, $raw = false, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13975,6 +14995,7 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13985,7 +15006,23 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13998,6 +15035,7 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14008,7 +15046,23 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14021,6 +15075,7 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14031,7 +15086,23 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14044,6 +15115,7 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14054,7 +15126,23 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14067,6 +15155,7 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14077,7 +15166,23 @@ public function journalEntriesAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14510,6 +15615,7 @@ public function journalEntriesDeleteRequest($id, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14520,7 +15626,23 @@ public function journalEntriesDeleteRequest($id, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14966,6 +16088,7 @@ public function journalEntriesOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14976,7 +16099,23 @@ public function journalEntriesOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14989,6 +16128,7 @@ public function journalEntriesOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14999,7 +16139,23 @@ public function journalEntriesOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15451,6 +16607,7 @@ public function journalEntriesUpdateRequest($id, $journal_entry, $x_apideck_cons
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15461,7 +16618,23 @@ public function journalEntriesUpdateRequest($id, $journal_entry, $x_apideck_cons
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15908,6 +17081,7 @@ public function ledgerAccountsAddRequest($request_body, $raw = false, $x_apideck
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15918,7 +17092,23 @@ public function ledgerAccountsAddRequest($request_body, $raw = false, $x_apideck
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16373,6 +17563,7 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16383,7 +17574,23 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16396,6 +17603,7 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16406,7 +17614,23 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16419,6 +17643,7 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16429,7 +17654,23 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16442,6 +17683,7 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16452,7 +17694,23 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16465,6 +17723,7 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16475,7 +17734,23 @@ public function ledgerAccountsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16908,6 +18183,7 @@ public function ledgerAccountsDeleteRequest($id, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16918,7 +18194,23 @@ public function ledgerAccountsDeleteRequest($id, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17364,6 +18656,7 @@ public function ledgerAccountsOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17374,7 +18667,23 @@ public function ledgerAccountsOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17387,6 +18696,7 @@ public function ledgerAccountsOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17397,7 +18707,23 @@ public function ledgerAccountsOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17849,6 +19175,7 @@ public function ledgerAccountsUpdateRequest($id, $request_body, $x_apideck_consu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17859,7 +19186,23 @@ public function ledgerAccountsUpdateRequest($id, $request_body, $x_apideck_consu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18306,6 +19649,7 @@ public function paymentsAddRequest($payment, $raw = false, $x_apideck_consumer_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18316,7 +19660,23 @@ public function paymentsAddRequest($payment, $raw = false, $x_apideck_consumer_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18776,6 +20136,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18786,7 +20147,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18799,6 +20176,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18809,7 +20187,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18822,6 +20216,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18832,7 +20227,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18845,6 +20256,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18855,7 +20267,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18868,6 +20296,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18878,7 +20307,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18891,6 +20336,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18901,7 +20347,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19334,6 +20796,7 @@ public function paymentsDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19344,7 +20807,23 @@ public function paymentsDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19790,6 +21269,7 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19800,7 +21280,23 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19813,6 +21309,7 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19823,7 +21320,23 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20275,6 +21788,7 @@ public function paymentsUpdateRequest($id, $payment, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20285,7 +21799,23 @@ public function paymentsUpdateRequest($id, $payment, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20736,6 +22266,7 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20746,7 +22277,23 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20759,6 +22306,7 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20769,7 +22317,23 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20782,6 +22346,7 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20792,7 +22357,23 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20805,6 +22386,7 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20815,7 +22397,23 @@ public function profitAndLossOneRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21248,6 +22846,7 @@ public function purchaseOrdersAddRequest($purchase_order, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21258,7 +22857,23 @@ public function purchaseOrdersAddRequest($purchase_order, $raw = false, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21708,6 +23323,7 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21718,7 +23334,23 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21731,6 +23363,7 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21741,7 +23374,23 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21754,6 +23403,7 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21764,7 +23414,23 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21777,6 +23443,7 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21787,7 +23454,23 @@ public function purchaseOrdersAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -22220,6 +23903,7 @@ public function purchaseOrdersDeleteRequest($id, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -22230,7 +23914,23 @@ public function purchaseOrdersDeleteRequest($id, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -22671,6 +24371,7 @@ public function purchaseOrdersOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -22681,7 +24382,23 @@ public function purchaseOrdersOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -23133,6 +24850,7 @@ public function purchaseOrdersUpdateRequest($id, $purchase_order, $x_apideck_con
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -23143,7 +24861,23 @@ public function purchaseOrdersUpdateRequest($id, $purchase_order, $x_apideck_con
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -23590,6 +25324,7 @@ public function suppliersAddRequest($supplier, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -23600,7 +25335,23 @@ public function suppliersAddRequest($supplier, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24060,6 +25811,7 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24070,7 +25822,23 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24083,6 +25851,7 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24093,7 +25862,23 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24106,6 +25891,7 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24116,7 +25902,23 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24129,6 +25931,7 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24139,7 +25942,23 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24152,6 +25971,7 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24162,7 +25982,23 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24175,6 +26011,7 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24185,7 +26022,23 @@ public function suppliersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24618,6 +26471,7 @@ public function suppliersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -24628,7 +26482,23 @@ public function suppliersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -25074,6 +26944,7 @@ public function suppliersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -25084,7 +26955,23 @@ public function suppliersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -25097,6 +26984,7 @@ public function suppliersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -25107,7 +26995,23 @@ public function suppliersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -25559,6 +27463,7 @@ public function suppliersUpdateRequest($id, $supplier, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -25569,7 +27474,23 @@ public function suppliersUpdateRequest($id, $supplier, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26016,6 +27937,7 @@ public function taxRatesAddRequest($tax_rate, $raw = false, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26026,7 +27948,23 @@ public function taxRatesAddRequest($tax_rate, $raw = false, $x_apideck_consumer_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26486,6 +28424,7 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26496,7 +28435,23 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26509,6 +28464,7 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26519,7 +28475,23 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26532,6 +28504,7 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26542,7 +28515,23 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26555,6 +28544,7 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26565,7 +28555,23 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26578,6 +28584,7 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26588,7 +28595,23 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26601,6 +28624,7 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -26611,7 +28635,23 @@ public function taxRatesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27044,6 +29084,7 @@ public function taxRatesDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27054,7 +29095,23 @@ public function taxRatesDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27500,6 +29557,7 @@ public function taxRatesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27510,7 +29568,23 @@ public function taxRatesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27523,6 +29597,7 @@ public function taxRatesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27533,7 +29608,23 @@ public function taxRatesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27985,6 +30076,7 @@ public function taxRatesUpdateRequest($id, $tax_rate, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -27995,7 +30087,23 @@ public function taxRatesUpdateRequest($id, $tax_rate, $x_apideck_consumer_id = n
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/AtsApi.php b/src/gen/lib/Api/AtsApi.php
index aae953244..c4f95fd2b 100644
--- a/src/gen/lib/Api/AtsApi.php
+++ b/src/gen/lib/Api/AtsApi.php
@@ -460,6 +460,7 @@ public function applicantsAddRequest($applicant, $raw = false, $x_apideck_consum
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function applicantsAddRequest($applicant, $raw = false, $x_apideck_consum
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -930,6 +947,7 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -940,7 +958,23 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -953,6 +987,7 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -963,7 +998,23 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -976,6 +1027,7 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -986,7 +1038,23 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -999,6 +1067,7 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1009,7 +1078,23 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1022,6 +1107,7 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1032,7 +1118,23 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1045,6 +1147,7 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1055,7 +1158,23 @@ public function applicantsAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1488,6 +1607,7 @@ public function applicantsDeleteRequest($id, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1498,7 +1618,23 @@ public function applicantsDeleteRequest($id, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1944,6 +2080,7 @@ public function applicantsOneRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1954,7 +2091,23 @@ public function applicantsOneRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1967,6 +2120,7 @@ public function applicantsOneRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1977,7 +2131,23 @@ public function applicantsOneRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2429,6 +2599,7 @@ public function applicantsUpdateRequest($id, $applicant, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2439,7 +2610,23 @@ public function applicantsUpdateRequest($id, $applicant, $x_apideck_consumer_id
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2886,6 +3073,7 @@ public function applicationsAddRequest($application, $raw = false, $x_apideck_co
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2896,7 +3084,23 @@ public function applicationsAddRequest($application, $raw = false, $x_apideck_co
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3346,6 +3550,7 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3356,7 +3561,23 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3369,6 +3590,7 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3379,7 +3601,23 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3392,6 +3630,7 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3402,7 +3641,23 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3415,6 +3670,7 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3425,7 +3681,23 @@ public function applicationsAllRequest($raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3858,6 +4130,7 @@ public function applicationsDeleteRequest($id, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3868,7 +4141,23 @@ public function applicationsDeleteRequest($id, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4309,6 +4598,7 @@ public function applicationsOneRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4319,7 +4609,23 @@ public function applicationsOneRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4771,6 +5077,7 @@ public function applicationsUpdateRequest($id, $application, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4781,7 +5088,23 @@ public function applicationsUpdateRequest($id, $application, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5244,6 +5567,7 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5254,7 +5578,23 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5267,6 +5607,7 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5277,7 +5618,23 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5290,6 +5647,7 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5300,7 +5658,23 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5313,6 +5687,7 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5323,7 +5698,23 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5336,6 +5727,7 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5346,7 +5738,23 @@ public function jobsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5784,6 +6192,7 @@ public function jobsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5794,7 +6203,23 @@ public function jobsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5807,6 +6232,7 @@ public function jobsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_ap
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5817,7 +6243,23 @@ public function jobsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_ap
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/ConnectorApi.php b/src/gen/lib/Api/ConnectorApi.php
index b74b29c60..78bf1ad11 100644
--- a/src/gen/lib/Api/ConnectorApi.php
+++ b/src/gen/lib/Api/ConnectorApi.php
@@ -1184,6 +1184,7 @@ public function apisAllRequest($x_apideck_app_id = null, $cursor = null, $limit
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1194,7 +1195,23 @@ public function apisAllRequest($x_apideck_app_id = null, $cursor = null, $limit
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1207,6 +1224,7 @@ public function apisAllRequest($x_apideck_app_id = null, $cursor = null, $limit
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1217,7 +1235,23 @@ public function apisAllRequest($x_apideck_app_id = null, $cursor = null, $limit
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1230,6 +1264,7 @@ public function apisAllRequest($x_apideck_app_id = null, $cursor = null, $limit
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1240,7 +1275,23 @@ public function apisAllRequest($x_apideck_app_id = null, $cursor = null, $limit
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2375,6 +2426,7 @@ public function connectorResourcesOneRequest($id, $resource_id, $x_apideck_app_i
         // query params
 
         if ('raw' === 'unified_api') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($unified_api)) {
                 foreach($unified_api as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2385,7 +2437,23 @@ public function connectorResourcesOneRequest($id, $resource_id, $x_apideck_app_i
             }
         }
 
-        if ($unified_api !== null && 'unified_api' !== 'raw') {
+
+        if ($unified_api !== null && 'sort' === 'unified_api') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($unified_api !== null && 'filter' === 'unified_api') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($unified_api !== null && !('unified_api' === 'raw' || 'unified_api' === 'sort' || 'unified_api' === 'filter')) {
             if('form' === 'form' && is_array($unified_api)) {
                 foreach($unified_api as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2782,6 +2850,7 @@ public function connectorsAllRequest($x_apideck_app_id = null, $cursor = null, $
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2792,7 +2861,23 @@ public function connectorsAllRequest($x_apideck_app_id = null, $cursor = null, $
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2805,6 +2890,7 @@ public function connectorsAllRequest($x_apideck_app_id = null, $cursor = null, $
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2815,7 +2901,23 @@ public function connectorsAllRequest($x_apideck_app_id = null, $cursor = null, $
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2828,6 +2930,7 @@ public function connectorsAllRequest($x_apideck_app_id = null, $cursor = null, $
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2838,7 +2941,23 @@ public function connectorsAllRequest($x_apideck_app_id = null, $cursor = null, $
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/CrmApi.php b/src/gen/lib/Api/CrmApi.php
index 50c518ea2..6b827a906 100644
--- a/src/gen/lib/Api/CrmApi.php
+++ b/src/gen/lib/Api/CrmApi.php
@@ -460,6 +460,7 @@ public function activitiesAddRequest($activity, $raw = false, $x_apideck_consume
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function activitiesAddRequest($activity, $raw = false, $x_apideck_consume
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -930,6 +947,7 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -940,7 +958,23 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -953,6 +987,7 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -963,7 +998,23 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -976,6 +1027,7 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -986,7 +1038,23 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -999,6 +1067,7 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1009,7 +1078,23 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1022,6 +1107,7 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1032,7 +1118,23 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1045,6 +1147,7 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1055,7 +1158,23 @@ public function activitiesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1488,6 +1607,7 @@ public function activitiesDeleteRequest($id, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1498,7 +1618,23 @@ public function activitiesDeleteRequest($id, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1944,6 +2080,7 @@ public function activitiesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1954,7 +2091,23 @@ public function activitiesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1967,6 +2120,7 @@ public function activitiesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1977,7 +2131,23 @@ public function activitiesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2429,6 +2599,7 @@ public function activitiesUpdateRequest($id, $activity, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2439,7 +2610,23 @@ public function activitiesUpdateRequest($id, $activity, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2886,6 +3073,7 @@ public function companiesAddRequest($company, $raw = false, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2896,7 +3084,23 @@ public function companiesAddRequest($company, $raw = false, $x_apideck_consumer_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3361,6 +3565,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3371,7 +3576,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3384,6 +3605,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3394,7 +3616,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3407,6 +3645,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3417,7 +3656,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3430,6 +3685,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3440,7 +3696,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3453,6 +3725,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3463,7 +3736,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3476,6 +3765,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3486,7 +3776,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3499,6 +3805,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3509,7 +3816,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3942,6 +4265,7 @@ public function companiesDeleteRequest($id, $raw = false, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3952,7 +4276,23 @@ public function companiesDeleteRequest($id, $raw = false, $x_apideck_consumer_id
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4398,6 +4738,7 @@ public function companiesOneRequest($id, $raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4408,7 +4749,23 @@ public function companiesOneRequest($id, $raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4421,6 +4778,7 @@ public function companiesOneRequest($id, $raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4431,7 +4789,23 @@ public function companiesOneRequest($id, $raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4883,6 +5257,7 @@ public function companiesUpdateRequest($id, $company, $raw = false, $x_apideck_c
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4893,7 +5268,23 @@ public function companiesUpdateRequest($id, $company, $raw = false, $x_apideck_c
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5340,6 +5731,7 @@ public function contactsAddRequest($contact, $raw = false, $x_apideck_consumer_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5350,7 +5742,23 @@ public function contactsAddRequest($contact, $raw = false, $x_apideck_consumer_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5815,6 +6223,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5825,7 +6234,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5838,6 +6263,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5848,7 +6274,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5861,6 +6303,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5871,7 +6314,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5884,6 +6343,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5894,7 +6354,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5907,6 +6383,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5917,7 +6394,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5930,6 +6423,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5940,7 +6434,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5953,6 +6463,7 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5963,7 +6474,23 @@ public function contactsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6396,6 +6923,7 @@ public function contactsDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6406,7 +6934,23 @@ public function contactsDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6852,6 +7396,7 @@ public function contactsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6862,7 +7407,23 @@ public function contactsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6875,6 +7436,7 @@ public function contactsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6885,7 +7447,23 @@ public function contactsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7337,6 +7915,7 @@ public function contactsUpdateRequest($id, $contact, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7347,7 +7926,23 @@ public function contactsUpdateRequest($id, $contact, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7794,6 +8389,7 @@ public function leadsAddRequest($lead, $raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7804,7 +8400,23 @@ public function leadsAddRequest($lead, $raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8269,6 +8881,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8279,7 +8892,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8292,6 +8921,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8302,7 +8932,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8315,6 +8961,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8325,7 +8972,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8338,6 +9001,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8348,7 +9012,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8361,6 +9041,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8371,7 +9052,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8384,6 +9081,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8394,7 +9092,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8407,6 +9121,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8417,7 +9132,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8850,6 +9581,7 @@ public function leadsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8860,7 +9592,23 @@ public function leadsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9306,6 +10054,7 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9316,7 +10065,23 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9329,6 +10094,7 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9339,7 +10105,23 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9791,6 +10573,7 @@ public function leadsUpdateRequest($id, $lead, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9801,7 +10584,23 @@ public function leadsUpdateRequest($id, $lead, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10248,6 +11047,7 @@ public function notesAddRequest($note, $raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10258,7 +11058,23 @@ public function notesAddRequest($note, $raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10713,6 +11529,7 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10723,7 +11540,23 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10736,6 +11569,7 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10746,7 +11580,23 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10759,6 +11609,7 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10769,7 +11620,23 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10782,6 +11649,7 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10792,7 +11660,23 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10805,6 +11689,7 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10815,7 +11700,23 @@ public function notesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11248,6 +12149,7 @@ public function notesDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11258,7 +12160,23 @@ public function notesDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11704,6 +12622,7 @@ public function notesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11714,7 +12633,23 @@ public function notesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11727,6 +12662,7 @@ public function notesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11737,7 +12673,23 @@ public function notesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12189,6 +13141,7 @@ public function notesUpdateRequest($id, $note, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12199,7 +13152,23 @@ public function notesUpdateRequest($id, $note, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12646,6 +13615,7 @@ public function opportunitiesAddRequest($opportunity, $raw = false, $x_apideck_c
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12656,7 +13626,23 @@ public function opportunitiesAddRequest($opportunity, $raw = false, $x_apideck_c
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13121,6 +14107,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13131,7 +14118,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13144,6 +14147,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13154,7 +14158,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13167,6 +14187,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13177,7 +14198,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13190,6 +14227,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13200,7 +14238,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13213,6 +14267,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13223,7 +14278,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13236,6 +14307,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13246,7 +14318,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13259,6 +14347,7 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13269,7 +14358,23 @@ public function opportunitiesAllRequest($raw = false, $x_apideck_consumer_id = n
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13702,6 +14807,7 @@ public function opportunitiesDeleteRequest($id, $x_apideck_consumer_id = null, $
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13712,7 +14818,23 @@ public function opportunitiesDeleteRequest($id, $x_apideck_consumer_id = null, $
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14158,6 +15280,7 @@ public function opportunitiesOneRequest($id, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14168,7 +15291,23 @@ public function opportunitiesOneRequest($id, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14181,6 +15320,7 @@ public function opportunitiesOneRequest($id, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14191,7 +15331,23 @@ public function opportunitiesOneRequest($id, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14643,6 +15799,7 @@ public function opportunitiesUpdateRequest($id, $opportunity, $x_apideck_consume
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14653,7 +15810,23 @@ public function opportunitiesUpdateRequest($id, $opportunity, $x_apideck_consume
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15100,6 +16273,7 @@ public function pipelinesAddRequest($pipeline, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15110,7 +16284,23 @@ public function pipelinesAddRequest($pipeline, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15565,6 +16755,7 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15575,7 +16766,23 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15588,6 +16795,7 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15598,7 +16806,23 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15611,6 +16835,7 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15621,7 +16846,23 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15634,6 +16875,7 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15644,7 +16886,23 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15657,6 +16915,7 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15667,7 +16926,23 @@ public function pipelinesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16100,6 +17375,7 @@ public function pipelinesDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16110,7 +17386,23 @@ public function pipelinesDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16556,6 +17848,7 @@ public function pipelinesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16566,7 +17859,23 @@ public function pipelinesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16579,6 +17888,7 @@ public function pipelinesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16589,7 +17899,23 @@ public function pipelinesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17041,6 +18367,7 @@ public function pipelinesUpdateRequest($id, $pipeline, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17051,7 +18378,23 @@ public function pipelinesUpdateRequest($id, $pipeline, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17498,6 +18841,7 @@ public function usersAddRequest($user, $raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17508,7 +18852,23 @@ public function usersAddRequest($user, $raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17963,6 +19323,7 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17973,7 +19334,23 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17986,6 +19363,7 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17996,7 +19374,23 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18009,6 +19403,7 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18019,7 +19414,23 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18032,6 +19443,7 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18042,7 +19454,23 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18055,6 +19483,7 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18065,7 +19494,23 @@ public function usersAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18498,6 +19943,7 @@ public function usersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18508,7 +19954,23 @@ public function usersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18954,6 +20416,7 @@ public function usersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18964,7 +20427,23 @@ public function usersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18977,6 +20456,7 @@ public function usersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18987,7 +20467,23 @@ public function usersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19439,6 +20935,7 @@ public function usersUpdateRequest($id, $user, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19449,7 +20946,23 @@ public function usersUpdateRequest($id, $user, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/EcommerceApi.php b/src/gen/lib/Api/EcommerceApi.php
index 7449c3f06..a26860b52 100644
--- a/src/gen/lib/Api/EcommerceApi.php
+++ b/src/gen/lib/Api/EcommerceApi.php
@@ -481,6 +481,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -491,7 +492,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -504,6 +521,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -514,7 +532,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -527,6 +561,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -537,7 +572,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -550,6 +601,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -560,7 +612,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -573,6 +641,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -583,7 +652,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -596,6 +681,7 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -606,7 +692,23 @@ public function customersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1044,6 +1146,7 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1054,7 +1157,23 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1067,6 +1186,7 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1077,7 +1197,23 @@ public function customersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1539,6 +1675,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1549,7 +1686,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1562,6 +1715,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1572,7 +1726,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1585,6 +1755,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1595,7 +1766,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1608,6 +1795,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1618,7 +1806,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1631,6 +1835,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1641,7 +1846,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1654,6 +1875,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1664,7 +1886,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2102,6 +2340,7 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2112,7 +2351,23 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2125,6 +2380,7 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2135,7 +2391,23 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2592,6 +2864,7 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2602,7 +2875,23 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2615,6 +2904,7 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2625,7 +2915,23 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2638,6 +2944,7 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2648,7 +2955,23 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2661,6 +2984,7 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2671,7 +2995,23 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2684,6 +3024,7 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2694,7 +3035,23 @@ public function productsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3132,6 +3489,7 @@ public function productsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3142,7 +3500,23 @@ public function productsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3155,6 +3529,7 @@ public function productsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3165,7 +3540,23 @@ public function productsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3600,6 +3991,7 @@ public function storesOneRequest($x_apideck_consumer_id = null, $x_apideck_app_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3610,7 +4002,23 @@ public function storesOneRequest($x_apideck_consumer_id = null, $x_apideck_app_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3623,6 +4031,7 @@ public function storesOneRequest($x_apideck_consumer_id = null, $x_apideck_app_i
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3633,7 +4042,23 @@ public function storesOneRequest($x_apideck_consumer_id = null, $x_apideck_app_i
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/FileStorageApi.php b/src/gen/lib/Api/FileStorageApi.php
index 830d84ea8..bbc0b5f28 100644
--- a/src/gen/lib/Api/FileStorageApi.php
+++ b/src/gen/lib/Api/FileStorageApi.php
@@ -460,6 +460,7 @@ public function driveGroupsAddRequest($drive_group, $raw = false, $x_apideck_con
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function driveGroupsAddRequest($drive_group, $raw = false, $x_apideck_con
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -930,6 +947,7 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -940,7 +958,23 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -953,6 +987,7 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -963,7 +998,23 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -976,6 +1027,7 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -986,7 +1038,23 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -999,6 +1067,7 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1009,7 +1078,23 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1022,6 +1107,7 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1032,7 +1118,23 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1045,6 +1147,7 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1055,7 +1158,23 @@ public function driveGroupsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1488,6 +1607,7 @@ public function driveGroupsDeleteRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1498,7 +1618,23 @@ public function driveGroupsDeleteRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1944,6 +2080,7 @@ public function driveGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1954,7 +2091,23 @@ public function driveGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1967,6 +2120,7 @@ public function driveGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1977,7 +2131,23 @@ public function driveGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2429,6 +2599,7 @@ public function driveGroupsUpdateRequest($id, $drive_group, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2439,7 +2610,23 @@ public function driveGroupsUpdateRequest($id, $drive_group, $x_apideck_consumer_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2886,6 +3073,7 @@ public function drivesAddRequest($drive, $raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2896,7 +3084,23 @@ public function drivesAddRequest($drive, $raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3351,6 +3555,7 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3361,7 +3566,23 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3374,6 +3595,7 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3384,7 +3606,23 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3397,6 +3635,7 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3407,7 +3646,23 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3420,6 +3675,7 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3430,7 +3686,23 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3443,6 +3715,7 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3453,7 +3726,23 @@ public function drivesAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3886,6 +4175,7 @@ public function drivesDeleteRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3896,7 +4186,23 @@ public function drivesDeleteRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4342,6 +4648,7 @@ public function drivesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4352,7 +4659,23 @@ public function drivesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4365,6 +4688,7 @@ public function drivesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4375,7 +4699,23 @@ public function drivesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4827,6 +5167,7 @@ public function drivesUpdateRequest($id, $drive, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4837,7 +5178,23 @@ public function drivesUpdateRequest($id, $drive, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5310,6 +5667,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5320,7 +5678,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5333,6 +5707,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5343,7 +5718,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5356,6 +5747,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5366,7 +5758,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5379,6 +5787,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5389,7 +5798,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5402,6 +5827,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5412,7 +5838,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5425,6 +5867,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5435,7 +5878,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5448,6 +5907,7 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5458,7 +5918,23 @@ public function filesAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5891,6 +6367,7 @@ public function filesDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5901,7 +6378,23 @@ public function filesDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6342,6 +6835,7 @@ public function filesDownloadRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6352,7 +6846,23 @@ public function filesDownloadRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6804,6 +7314,7 @@ public function filesExportRequest($id, $format, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6814,7 +7325,23 @@ public function filesExportRequest($id, $format, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6827,6 +7354,7 @@ public function filesExportRequest($id, $format, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'format') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($format)) {
                 foreach($format as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6837,7 +7365,23 @@ public function filesExportRequest($id, $format, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($format !== null && 'format' !== 'raw') {
+
+        if ($format !== null && 'sort' === 'format') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($format !== null && 'filter' === 'format') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($format !== null && !('format' === 'raw' || 'format' === 'sort' || 'format' === 'filter')) {
             if('form' === 'form' && is_array($format)) {
                 foreach($format as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7283,6 +7827,7 @@ public function filesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7293,7 +7838,23 @@ public function filesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7306,6 +7867,7 @@ public function filesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7316,7 +7878,23 @@ public function filesOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7779,6 +8357,7 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7789,7 +8368,23 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7802,6 +8397,7 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7812,7 +8408,23 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7825,6 +8437,7 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7835,7 +8448,23 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7848,6 +8477,7 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7858,7 +8488,23 @@ public function filesSearchRequest($files_search, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8308,6 +8954,7 @@ public function filesUpdateRequest($id, $update_file_request, $x_apideck_consume
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8318,7 +8965,23 @@ public function filesUpdateRequest($id, $update_file_request, $x_apideck_consume
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8770,6 +9433,7 @@ public function foldersAddRequest($create_folder_request, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8780,7 +9444,23 @@ public function foldersAddRequest($create_folder_request, $raw = false, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8793,6 +9473,7 @@ public function foldersAddRequest($create_folder_request, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8803,7 +9484,23 @@ public function foldersAddRequest($create_folder_request, $raw = false, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9258,6 +9955,7 @@ public function foldersCopyRequest($id, $copy_folder_request, $x_apideck_consume
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9268,7 +9966,23 @@ public function foldersCopyRequest($id, $copy_folder_request, $x_apideck_consume
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9281,6 +9995,7 @@ public function foldersCopyRequest($id, $copy_folder_request, $x_apideck_consume
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9291,7 +10006,23 @@ public function foldersCopyRequest($id, $copy_folder_request, $x_apideck_consume
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9738,6 +10469,7 @@ public function foldersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9748,7 +10480,23 @@ public function foldersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10194,6 +10942,7 @@ public function foldersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10204,7 +10953,23 @@ public function foldersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10217,6 +10982,7 @@ public function foldersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10227,7 +10993,23 @@ public function foldersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10679,6 +11461,7 @@ public function foldersUpdateRequest($id, $update_folder_request, $x_apideck_con
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10689,7 +11472,23 @@ public function foldersUpdateRequest($id, $update_folder_request, $x_apideck_con
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11136,6 +11935,7 @@ public function sharedLinksAddRequest($shared_link, $raw = false, $x_apideck_con
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11146,7 +11946,23 @@ public function sharedLinksAddRequest($shared_link, $raw = false, $x_apideck_con
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11601,6 +12417,7 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11611,7 +12428,23 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11624,6 +12457,7 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11634,7 +12468,23 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11647,6 +12497,7 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11657,7 +12508,23 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11670,6 +12537,7 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11680,7 +12548,23 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11693,6 +12577,7 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11703,7 +12588,23 @@ public function sharedLinksAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12136,6 +13037,7 @@ public function sharedLinksDeleteRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12146,7 +13048,23 @@ public function sharedLinksDeleteRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12592,6 +13510,7 @@ public function sharedLinksOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12602,7 +13521,23 @@ public function sharedLinksOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12615,6 +13550,7 @@ public function sharedLinksOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12625,7 +13561,23 @@ public function sharedLinksOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13077,6 +14029,7 @@ public function sharedLinksUpdateRequest($id, $shared_link, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13087,7 +14040,23 @@ public function sharedLinksUpdateRequest($id, $shared_link, $x_apideck_consumer_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13549,6 +14518,7 @@ public function uploadSessionsAddRequest($create_upload_session_request, $raw =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13559,7 +14529,23 @@ public function uploadSessionsAddRequest($create_upload_session_request, $raw =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14004,6 +14990,7 @@ public function uploadSessionsDeleteRequest($id, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14014,7 +15001,23 @@ public function uploadSessionsDeleteRequest($id, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14480,6 +15483,7 @@ public function uploadSessionsFinishRequest($id, $raw = false, $x_apideck_consum
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14490,7 +15494,23 @@ public function uploadSessionsFinishRequest($id, $raw = false, $x_apideck_consum
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14967,6 +15987,7 @@ public function uploadSessionsOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14977,7 +15998,23 @@ public function uploadSessionsOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14990,6 +16027,7 @@ public function uploadSessionsOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15000,7 +16038,23 @@ public function uploadSessionsOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/HrisApi.php b/src/gen/lib/Api/HrisApi.php
index d401afb51..b70aebdb2 100644
--- a/src/gen/lib/Api/HrisApi.php
+++ b/src/gen/lib/Api/HrisApi.php
@@ -460,6 +460,7 @@ public function companiesAddRequest($hris_company, $raw = false, $x_apideck_cons
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function companiesAddRequest($hris_company, $raw = false, $x_apideck_cons
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -925,6 +942,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -935,7 +953,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -948,6 +982,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -958,7 +993,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -971,6 +1022,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -981,7 +1033,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -994,6 +1062,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1004,7 +1073,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1017,6 +1102,7 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1027,7 +1113,23 @@ public function companiesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1460,6 +1562,7 @@ public function companiesDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1470,7 +1573,23 @@ public function companiesDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1916,6 +2035,7 @@ public function companiesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1926,7 +2046,23 @@ public function companiesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1939,6 +2075,7 @@ public function companiesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1949,7 +2086,23 @@ public function companiesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2401,6 +2554,7 @@ public function companiesUpdateRequest($id, $hris_company, $x_apideck_consumer_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2411,7 +2565,23 @@ public function companiesUpdateRequest($id, $hris_company, $x_apideck_consumer_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2858,6 +3028,7 @@ public function departmentsAddRequest($department, $raw = false, $x_apideck_cons
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2868,7 +3039,23 @@ public function departmentsAddRequest($department, $raw = false, $x_apideck_cons
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3323,6 +3510,7 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3333,7 +3521,23 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3346,6 +3550,7 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3356,7 +3561,23 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3369,6 +3590,7 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3379,7 +3601,23 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3392,6 +3630,7 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3402,7 +3641,23 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3415,6 +3670,7 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3425,7 +3681,23 @@ public function departmentsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3858,6 +4130,7 @@ public function departmentsDeleteRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3868,7 +4141,23 @@ public function departmentsDeleteRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4314,6 +4603,7 @@ public function departmentsOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4324,7 +4614,23 @@ public function departmentsOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4337,6 +4643,7 @@ public function departmentsOneRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4347,7 +4654,23 @@ public function departmentsOneRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4799,6 +5122,7 @@ public function departmentsUpdateRequest($id, $department, $x_apideck_consumer_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4809,7 +5133,23 @@ public function departmentsUpdateRequest($id, $department, $x_apideck_consumer_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5271,6 +5611,7 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5281,7 +5622,23 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5294,6 +5651,7 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5304,7 +5662,23 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5317,6 +5691,7 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5327,7 +5702,23 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5340,6 +5731,7 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5350,7 +5742,23 @@ public function employeePayrollsAllRequest($employee_id, $raw = false, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5807,6 +6215,7 @@ public function employeePayrollsOneRequest($payroll_id, $employee_id, $raw = fal
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5817,7 +6226,23 @@ public function employeePayrollsOneRequest($payroll_id, $employee_id, $raw = fal
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5830,6 +6255,7 @@ public function employeePayrollsOneRequest($payroll_id, $employee_id, $raw = fal
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5840,7 +6266,23 @@ public function employeePayrollsOneRequest($payroll_id, $employee_id, $raw = fal
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6299,6 +6741,7 @@ public function employeeSchedulesAllRequest($employee_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6309,7 +6752,23 @@ public function employeeSchedulesAllRequest($employee_id, $raw = false, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6322,6 +6781,7 @@ public function employeeSchedulesAllRequest($employee_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6332,7 +6792,23 @@ public function employeeSchedulesAllRequest($employee_id, $raw = false, $x_apide
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6345,6 +6821,7 @@ public function employeeSchedulesAllRequest($employee_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6355,7 +6832,23 @@ public function employeeSchedulesAllRequest($employee_id, $raw = false, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6796,6 +7289,7 @@ public function employeesAddRequest($employee, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6806,7 +7300,23 @@ public function employeesAddRequest($employee, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7271,6 +7781,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7281,7 +7792,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7294,6 +7821,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7304,7 +7832,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7317,6 +7861,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7327,7 +7872,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7340,6 +7901,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7350,7 +7912,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7363,6 +7941,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7373,7 +7952,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7386,6 +7981,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7396,7 +7992,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7409,6 +8021,7 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7419,7 +8032,23 @@ public function employeesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7852,6 +8481,7 @@ public function employeesDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7862,7 +8492,23 @@ public function employeesDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8308,6 +8954,7 @@ public function employeesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8318,7 +8965,23 @@ public function employeesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8331,6 +8994,7 @@ public function employeesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8341,7 +9005,23 @@ public function employeesOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8793,6 +9473,7 @@ public function employeesUpdateRequest($id, $employee, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8803,7 +9484,23 @@ public function employeesUpdateRequest($id, $employee, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9254,6 +9951,7 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9264,7 +9962,23 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9277,6 +9991,7 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9287,7 +10002,23 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9300,6 +10031,7 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9310,7 +10042,23 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9323,6 +10071,7 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9333,7 +10082,23 @@ public function payrollsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9771,6 +10536,7 @@ public function payrollsOneRequest($payroll_id, $raw = false, $x_apideck_consume
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9781,7 +10547,23 @@ public function payrollsOneRequest($payroll_id, $raw = false, $x_apideck_consume
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9794,6 +10576,7 @@ public function payrollsOneRequest($payroll_id, $raw = false, $x_apideck_consume
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9804,7 +10587,23 @@ public function payrollsOneRequest($payroll_id, $raw = false, $x_apideck_consume
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10245,6 +11044,7 @@ public function timeOffRequestsAddRequest($time_off_request, $raw = false, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10255,7 +11055,23 @@ public function timeOffRequestsAddRequest($time_off_request, $raw = false, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10715,6 +11531,7 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10725,7 +11542,23 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10738,6 +11571,7 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10748,7 +11582,23 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10761,6 +11611,7 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10771,7 +11622,23 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10784,6 +11651,7 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10794,7 +11662,23 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10807,6 +11691,7 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10817,7 +11702,23 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10830,6 +11731,7 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10840,7 +11742,23 @@ public function timeOffRequestsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11273,6 +12191,7 @@ public function timeOffRequestsDeleteRequest($id, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11283,7 +12202,23 @@ public function timeOffRequestsDeleteRequest($id, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11729,6 +12664,7 @@ public function timeOffRequestsOneRequest($id, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11739,7 +12675,23 @@ public function timeOffRequestsOneRequest($id, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11752,6 +12704,7 @@ public function timeOffRequestsOneRequest($id, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11762,7 +12715,23 @@ public function timeOffRequestsOneRequest($id, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12214,6 +13183,7 @@ public function timeOffRequestsUpdateRequest($id, $time_off_request, $x_apideck_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12224,7 +13194,23 @@ public function timeOffRequestsUpdateRequest($id, $time_off_request, $x_apideck_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/IssueTrackingApi.php b/src/gen/lib/Api/IssueTrackingApi.php
index f622b4199..dd2f02b29 100644
--- a/src/gen/lib/Api/IssueTrackingApi.php
+++ b/src/gen/lib/Api/IssueTrackingApi.php
@@ -487,6 +487,7 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -497,7 +498,23 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -510,6 +527,7 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -520,7 +538,23 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -533,6 +567,7 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -543,7 +578,23 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -556,6 +607,7 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -566,7 +618,23 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -579,6 +647,7 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -589,7 +658,23 @@ public function collectionTagsAllRequest($collection_id, $raw = false, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1052,6 +1137,7 @@ public function collectionTicketCommentsAddRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1062,7 +1148,23 @@ public function collectionTicketCommentsAddRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1560,6 +1662,7 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1570,7 +1673,23 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1583,6 +1702,7 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1593,7 +1713,23 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1606,6 +1742,7 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1616,7 +1753,23 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1629,6 +1782,7 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1639,7 +1793,23 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1652,6 +1822,7 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1662,7 +1833,23 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1675,6 +1862,7 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1685,7 +1873,23 @@ public function collectionTicketCommentsAllRequest($collection_id, $ticket_id, $
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2156,6 +2360,7 @@ public function collectionTicketCommentsDeleteRequest($id, $collection_id, $tick
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2166,7 +2371,23 @@ public function collectionTicketCommentsDeleteRequest($id, $collection_id, $tick
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2667,6 +2888,7 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2677,7 +2899,23 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2690,6 +2928,7 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2700,7 +2939,23 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2713,6 +2968,7 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2723,7 +2979,23 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2736,6 +3008,7 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2746,7 +3019,23 @@ public function collectionTicketCommentsOneRequest($id, $collection_id, $ticket_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3236,6 +3525,7 @@ public function collectionTicketCommentsUpdateRequest($id, $collection_id, $tick
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3246,7 +3536,23 @@ public function collectionTicketCommentsUpdateRequest($id, $collection_id, $tick
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3720,6 +4026,7 @@ public function collectionTicketsAddRequest($collection_id, $ticket, $raw = fals
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3730,7 +4037,23 @@ public function collectionTicketsAddRequest($collection_id, $ticket, $raw = fals
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4214,6 +4537,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4224,7 +4548,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4237,6 +4577,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4247,7 +4588,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4260,6 +4617,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4270,7 +4628,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4283,6 +4657,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4293,7 +4668,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4306,6 +4697,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4316,7 +4708,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4329,6 +4737,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4339,7 +4748,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4352,6 +4777,7 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4362,7 +4788,23 @@ public function collectionTicketsAllRequest($collection_id, $raw = false, $x_api
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4814,6 +5256,7 @@ public function collectionTicketsDeleteRequest($ticket_id, $collection_id, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4824,7 +5267,23 @@ public function collectionTicketsDeleteRequest($ticket_id, $collection_id, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5289,6 +5748,7 @@ public function collectionTicketsOneRequest($ticket_id, $collection_id, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5299,7 +5759,23 @@ public function collectionTicketsOneRequest($ticket_id, $collection_id, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5312,6 +5788,7 @@ public function collectionTicketsOneRequest($ticket_id, $collection_id, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5322,7 +5799,23 @@ public function collectionTicketsOneRequest($ticket_id, $collection_id, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5793,6 +6286,7 @@ public function collectionTicketsUpdateRequest($ticket_id, $collection_id, $tick
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5803,7 +6297,23 @@ public function collectionTicketsUpdateRequest($ticket_id, $collection_id, $tick
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6285,6 +6795,7 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6295,7 +6806,23 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6308,6 +6835,7 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6318,7 +6846,23 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6331,6 +6875,7 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6341,7 +6886,23 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6354,6 +6915,7 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6364,7 +6926,23 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6377,6 +6955,7 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6387,7 +6966,23 @@ public function collectionUsersAllRequest($collection_id, $raw = false, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6844,6 +7439,7 @@ public function collectionUsersOneRequest($collection_id, $id, $x_apideck_consum
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6854,7 +7450,23 @@ public function collectionUsersOneRequest($collection_id, $id, $x_apideck_consum
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6867,6 +7479,7 @@ public function collectionUsersOneRequest($collection_id, $id, $x_apideck_consum
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6877,7 +7490,23 @@ public function collectionUsersOneRequest($collection_id, $id, $x_apideck_consum
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7347,6 +7976,7 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7357,7 +7987,23 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7370,6 +8016,7 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7380,7 +8027,23 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7393,6 +8056,7 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7403,7 +8067,23 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7416,6 +8096,7 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7426,7 +8107,23 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7439,6 +8136,7 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'pass_through') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7449,7 +8147,23 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($pass_through !== null && 'pass_through' !== 'raw') {
+
+        if ($pass_through !== null && 'sort' === 'pass_through') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($pass_through !== null && 'filter' === 'pass_through') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($pass_through !== null && !('pass_through' === 'raw' || 'pass_through' === 'sort' || 'pass_through' === 'filter')) {
             if('form' === 'deepObject' && is_array($pass_through)) {
                 foreach($pass_through as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7462,6 +8176,7 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7472,7 +8187,23 @@ public function collectionsAllRequest($raw = false, $x_apideck_consumer_id = nul
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7910,6 +8641,7 @@ public function collectionsOneRequest($collection_id, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7920,7 +8652,23 @@ public function collectionsOneRequest($collection_id, $x_apideck_consumer_id = n
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7933,6 +8681,7 @@ public function collectionsOneRequest($collection_id, $x_apideck_consumer_id = n
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7943,7 +8692,23 @@ public function collectionsOneRequest($collection_id, $x_apideck_consumer_id = n
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/LeadApi.php b/src/gen/lib/Api/LeadApi.php
index 1a5d79ed3..742b34f1c 100644
--- a/src/gen/lib/Api/LeadApi.php
+++ b/src/gen/lib/Api/LeadApi.php
@@ -460,6 +460,7 @@ public function leadsAddRequest($lead, $raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function leadsAddRequest($lead, $raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -930,6 +947,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -940,7 +958,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -953,6 +987,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -963,7 +998,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -976,6 +1027,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -986,7 +1038,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -999,6 +1067,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1009,7 +1078,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1022,6 +1107,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'sort') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1032,7 +1118,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($sort !== null && 'sort' !== 'raw') {
+
+        if ($sort !== null && 'sort' === 'sort') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($sort !== null && 'filter' === 'sort') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($sort !== null && !('sort' === 'raw' || 'sort' === 'sort' || 'sort' === 'filter')) {
             if('form' === 'deepObject' && is_array($sort)) {
                 foreach($sort as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1045,6 +1147,7 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1055,7 +1158,23 @@ public function leadsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1488,6 +1607,7 @@ public function leadsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1498,7 +1618,23 @@ public function leadsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1944,6 +2080,7 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1954,7 +2091,23 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1967,6 +2120,7 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1977,7 +2131,23 @@ public function leadsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2429,6 +2599,7 @@ public function leadsUpdateRequest($id, $lead, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2439,7 +2610,23 @@ public function leadsUpdateRequest($id, $lead, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/PosApi.php b/src/gen/lib/Api/PosApi.php
index 726c91ff5..583ead461 100644
--- a/src/gen/lib/Api/PosApi.php
+++ b/src/gen/lib/Api/PosApi.php
@@ -460,6 +460,7 @@ public function itemsAddRequest($item, $raw = false, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function itemsAddRequest($item, $raw = false, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -920,6 +937,7 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -930,7 +948,23 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -943,6 +977,7 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -953,7 +988,23 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -966,6 +1017,7 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -976,7 +1028,23 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -989,6 +1057,7 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -999,7 +1068,23 @@ public function itemsAllRequest($raw = false, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1432,6 +1517,7 @@ public function itemsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1442,7 +1528,23 @@ public function itemsDeleteRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1888,6 +1990,7 @@ public function itemsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1898,7 +2001,23 @@ public function itemsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1911,6 +2030,7 @@ public function itemsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1921,7 +2041,23 @@ public function itemsOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_a
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2373,6 +2509,7 @@ public function itemsUpdateRequest($id, $item, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2383,7 +2520,23 @@ public function itemsUpdateRequest($id, $item, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2830,6 +2983,7 @@ public function locationsAddRequest($location, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2840,7 +2994,23 @@ public function locationsAddRequest($location, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3290,6 +3460,7 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3300,7 +3471,23 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3313,6 +3500,7 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3323,7 +3511,23 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3336,6 +3540,7 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3346,7 +3551,23 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3359,6 +3580,7 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3369,7 +3591,23 @@ public function locationsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3802,6 +4040,7 @@ public function locationsDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3812,7 +4051,23 @@ public function locationsDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4258,6 +4513,7 @@ public function locationsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4268,7 +4524,23 @@ public function locationsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4281,6 +4553,7 @@ public function locationsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4291,7 +4564,23 @@ public function locationsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4743,6 +5032,7 @@ public function locationsUpdateRequest($id, $location, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4753,7 +5043,23 @@ public function locationsUpdateRequest($id, $location, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5200,6 +5506,7 @@ public function merchantsAddRequest($merchant, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5210,7 +5517,23 @@ public function merchantsAddRequest($merchant, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5660,6 +5983,7 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5670,7 +5994,23 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5683,6 +6023,7 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5693,7 +6034,23 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5706,6 +6063,7 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5716,7 +6074,23 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5729,6 +6103,7 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -5739,7 +6114,23 @@ public function merchantsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6172,6 +6563,7 @@ public function merchantsDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6182,7 +6574,23 @@ public function merchantsDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6628,6 +7036,7 @@ public function merchantsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6638,7 +7047,23 @@ public function merchantsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6651,6 +7076,7 @@ public function merchantsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6661,7 +7087,23 @@ public function merchantsOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7113,6 +7555,7 @@ public function merchantsUpdateRequest($id, $merchant, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7123,7 +7566,23 @@ public function merchantsUpdateRequest($id, $merchant, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7570,6 +8029,7 @@ public function modifierGroupsAddRequest($modifier_group, $raw = false, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -7580,7 +8040,23 @@ public function modifierGroupsAddRequest($modifier_group, $raw = false, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8030,6 +8506,7 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8040,7 +8517,23 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8053,6 +8546,7 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8063,7 +8557,23 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8076,6 +8586,7 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8086,7 +8597,23 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8099,6 +8626,7 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8109,7 +8637,23 @@ public function modifierGroupsAllRequest($raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8542,6 +9086,7 @@ public function modifierGroupsDeleteRequest($id, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8552,7 +9097,23 @@ public function modifierGroupsDeleteRequest($id, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -8998,6 +9559,7 @@ public function modifierGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9008,7 +9570,23 @@ public function modifierGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9021,6 +9599,7 @@ public function modifierGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9031,7 +9610,23 @@ public function modifierGroupsOneRequest($id, $x_apideck_consumer_id = null, $x_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9483,6 +10078,7 @@ public function modifierGroupsUpdateRequest($id, $modifier_group, $x_apideck_con
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9493,7 +10089,23 @@ public function modifierGroupsUpdateRequest($id, $modifier_group, $x_apideck_con
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9940,6 +10552,7 @@ public function modifiersAddRequest($modifier, $raw = false, $x_apideck_consumer
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -9950,7 +10563,23 @@ public function modifiersAddRequest($modifier, $raw = false, $x_apideck_consumer
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10400,6 +11029,7 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10410,7 +11040,23 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10423,6 +11069,7 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10433,7 +11080,23 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10446,6 +11109,7 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10456,7 +11120,23 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10469,6 +11149,7 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10479,7 +11160,23 @@ public function modifiersAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10917,6 +11614,7 @@ public function modifiersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10927,7 +11625,23 @@ public function modifiersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10940,6 +11654,7 @@ public function modifiersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -10950,7 +11665,23 @@ public function modifiersDeleteRequest($id, $x_apideck_consumer_id = null, $x_ap
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11401,6 +12132,7 @@ public function modifiersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11411,7 +12143,23 @@ public function modifiersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11424,6 +12172,7 @@ public function modifiersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11434,7 +12183,23 @@ public function modifiersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11447,6 +12212,7 @@ public function modifiersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11457,7 +12223,23 @@ public function modifiersOneRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11909,6 +12691,7 @@ public function modifiersUpdateRequest($id, $modifier, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -11919,7 +12702,23 @@ public function modifiersUpdateRequest($id, $modifier, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12366,6 +13165,7 @@ public function orderTypesAddRequest($order_type, $raw = false, $x_apideck_consu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12376,7 +13176,23 @@ public function orderTypesAddRequest($order_type, $raw = false, $x_apideck_consu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12826,6 +13642,7 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12836,7 +13653,23 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12849,6 +13682,7 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12859,7 +13693,23 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12872,6 +13722,7 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12882,7 +13733,23 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12895,6 +13762,7 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -12905,7 +13773,23 @@ public function orderTypesAllRequest($raw = false, $x_apideck_consumer_id = null
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13338,6 +14222,7 @@ public function orderTypesDeleteRequest($id, $x_apideck_consumer_id = null, $x_a
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13348,7 +14233,23 @@ public function orderTypesDeleteRequest($id, $x_apideck_consumer_id = null, $x_a
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13794,6 +14695,7 @@ public function orderTypesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13804,7 +14706,23 @@ public function orderTypesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13817,6 +14735,7 @@ public function orderTypesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -13827,7 +14746,23 @@ public function orderTypesOneRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14279,6 +15214,7 @@ public function orderTypesUpdateRequest($id, $order_type, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14289,7 +15225,23 @@ public function orderTypesUpdateRequest($id, $order_type, $x_apideck_consumer_id
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14736,6 +15688,7 @@ public function ordersAddRequest($order, $raw = false, $x_apideck_consumer_id =
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -14746,7 +15699,23 @@ public function ordersAddRequest($order, $raw = false, $x_apideck_consumer_id =
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15201,6 +16170,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15211,7 +16181,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15224,6 +16210,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15234,7 +16221,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15247,6 +16250,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15257,7 +16261,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15270,6 +16290,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'location_id') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($location_id)) {
                 foreach($location_id as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15280,7 +16301,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($location_id !== null && 'location_id' !== 'raw') {
+
+        if ($location_id !== null && 'sort' === 'location_id') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($location_id !== null && 'filter' === 'location_id') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($location_id !== null && !('location_id' === 'raw' || 'location_id' === 'sort' || 'location_id' === 'filter')) {
             if('form' === 'form' && is_array($location_id)) {
                 foreach($location_id as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15293,6 +16330,7 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15303,7 +16341,23 @@ public function ordersAllRequest($raw = false, $x_apideck_consumer_id = null, $x
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15736,6 +16790,7 @@ public function ordersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apide
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -15746,7 +16801,23 @@ public function ordersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apide
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16192,6 +17263,7 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16202,7 +17274,23 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16215,6 +17303,7 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16225,7 +17314,23 @@ public function ordersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16682,6 +17787,7 @@ public function ordersPayRequest($id, $order, $raw = false, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16692,7 +17798,23 @@ public function ordersPayRequest($id, $order, $raw = false, $x_apideck_consumer_
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16705,6 +17827,7 @@ public function ordersPayRequest($id, $order, $raw = false, $x_apideck_consumer_
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -16715,7 +17838,23 @@ public function ordersPayRequest($id, $order, $raw = false, $x_apideck_consumer_
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17173,6 +18312,7 @@ public function ordersUpdateRequest($id, $order, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17183,7 +18323,23 @@ public function ordersUpdateRequest($id, $order, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17630,6 +18786,7 @@ public function paymentsAddRequest($pos_payment, $raw = false, $x_apideck_consum
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -17640,7 +18797,23 @@ public function paymentsAddRequest($pos_payment, $raw = false, $x_apideck_consum
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18090,6 +19263,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18100,7 +19274,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18113,6 +19303,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18123,7 +19314,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18136,6 +19343,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18146,7 +19354,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18159,6 +19383,7 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18169,7 +19394,23 @@ public function paymentsAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18602,6 +19843,7 @@ public function paymentsDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -18612,7 +19854,23 @@ public function paymentsDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19058,6 +20316,7 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19068,7 +20327,23 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19081,6 +20356,7 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19091,7 +20367,23 @@ public function paymentsOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19543,6 +20835,7 @@ public function paymentsUpdateRequest($id, $pos_payment, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -19553,7 +20846,23 @@ public function paymentsUpdateRequest($id, $pos_payment, $x_apideck_consumer_id
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20000,6 +21309,7 @@ public function tendersAddRequest($tender, $raw = false, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20010,7 +21320,23 @@ public function tendersAddRequest($tender, $raw = false, $x_apideck_consumer_id
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20460,6 +21786,7 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20470,7 +21797,23 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20483,6 +21826,7 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20493,7 +21837,23 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20506,6 +21866,7 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20516,7 +21877,23 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20529,6 +21906,7 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20539,7 +21917,23 @@ public function tendersAllRequest($raw = false, $x_apideck_consumer_id = null, $
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20972,6 +22366,7 @@ public function tendersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apid
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -20982,7 +22377,23 @@ public function tendersDeleteRequest($id, $x_apideck_consumer_id = null, $x_apid
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21428,6 +22839,7 @@ public function tendersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21438,7 +22850,23 @@ public function tendersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21451,6 +22879,7 @@ public function tendersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21461,7 +22890,23 @@ public function tendersOneRequest($id, $x_apideck_consumer_id = null, $x_apideck
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21913,6 +23358,7 @@ public function tendersUpdateRequest($id, $tender, $x_apideck_consumer_id = null
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -21923,7 +23369,23 @@ public function tendersUpdateRequest($id, $tender, $x_apideck_consumer_id = null
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/SmsApi.php b/src/gen/lib/Api/SmsApi.php
index 0b06dd73f..cc1b2d950 100644
--- a/src/gen/lib/Api/SmsApi.php
+++ b/src/gen/lib/Api/SmsApi.php
@@ -460,6 +460,7 @@ public function messagesAddRequest($message, $raw = false, $x_apideck_consumer_i
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -470,7 +471,23 @@ public function messagesAddRequest($message, $raw = false, $x_apideck_consumer_i
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -920,6 +937,7 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -930,7 +948,23 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -943,6 +977,7 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -953,7 +988,23 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -966,6 +1017,7 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -976,7 +1028,23 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -989,6 +1057,7 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -999,7 +1068,23 @@ public function messagesAllRequest($raw = false, $x_apideck_consumer_id = null,
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1432,6 +1517,7 @@ public function messagesDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1442,7 +1528,23 @@ public function messagesDeleteRequest($id, $x_apideck_consumer_id = null, $x_api
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1888,6 +1990,7 @@ public function messagesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1898,7 +2001,23 @@ public function messagesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1911,6 +2030,7 @@ public function messagesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
         // query params
 
         if ('raw' === 'fields') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1921,7 +2041,23 @@ public function messagesOneRequest($id, $x_apideck_consumer_id = null, $x_apidec
             }
         }
 
-        if ($fields !== null && 'fields' !== 'raw') {
+
+        if ($fields !== null && 'sort' === 'fields') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($fields !== null && 'filter' === 'fields') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($fields !== null && !('fields' === 'raw' || 'fields' === 'sort' || 'fields' === 'filter')) {
             if('form' === 'form' && is_array($fields)) {
                 foreach($fields as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2373,6 +2509,7 @@ public function messagesUpdateRequest($id, $message, $x_apideck_consumer_id = nu
         // query params
 
         if ('raw' === 'raw') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
@@ -2383,7 +2520,23 @@ public function messagesUpdateRequest($id, $message, $x_apideck_consumer_id = nu
             }
         }
 
-        if ($raw !== null && 'raw' !== 'raw') {
+
+        if ($raw !== null && 'sort' === 'raw') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($raw !== null && 'filter' === 'raw') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($raw !== null && !('raw' === 'raw' || 'raw' === 'sort' || 'raw' === 'filter')) {
             if('form' === 'form' && is_array($raw)) {
                 foreach($raw as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/VaultApi.php b/src/gen/lib/Api/VaultApi.php
index 2870a0583..a403643fb 100644
--- a/src/gen/lib/Api/VaultApi.php
+++ b/src/gen/lib/Api/VaultApi.php
@@ -1370,6 +1370,7 @@ public function connectionsAllRequest($x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'api') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($api)) {
                 foreach($api as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1380,7 +1381,23 @@ public function connectionsAllRequest($x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($api !== null && 'api' !== 'raw') {
+
+        if ($api !== null && 'sort' === 'api') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($api !== null && 'filter' === 'api') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($api !== null && !('api' === 'raw' || 'api' === 'sort' || 'api' === 'filter')) {
             if('form' === 'form' && is_array($api)) {
                 foreach($api as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1393,6 +1410,7 @@ public function connectionsAllRequest($x_apideck_consumer_id = null, $x_apideck_
         // query params
 
         if ('raw' === 'configured') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($configured)) {
                 foreach($configured as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1403,7 +1421,23 @@ public function connectionsAllRequest($x_apideck_consumer_id = null, $x_apideck_
             }
         }
 
-        if ($configured !== null && 'configured' !== 'raw') {
+
+        if ($configured !== null && 'sort' === 'configured') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($configured !== null && 'filter' === 'configured') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($configured !== null && !('configured' === 'raw' || 'configured' === 'sort' || 'configured' === 'filter')) {
             if('form' === 'form' && is_array($configured)) {
                 foreach($configured as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3488,6 +3522,7 @@ public function consumerRequestCountsAllRequest($consumer_id, $start_datetime, $
         // query params
 
         if ('raw' === 'start_datetime') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($start_datetime)) {
                 foreach($start_datetime as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3498,7 +3533,23 @@ public function consumerRequestCountsAllRequest($consumer_id, $start_datetime, $
             }
         }
 
-        if ($start_datetime !== null && 'start_datetime' !== 'raw') {
+
+        if ($start_datetime !== null && 'sort' === 'start_datetime') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($start_datetime !== null && 'filter' === 'start_datetime') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($start_datetime !== null && !('start_datetime' === 'raw' || 'start_datetime' === 'sort' || 'start_datetime' === 'filter')) {
             if('form' === 'form' && is_array($start_datetime)) {
                 foreach($start_datetime as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3511,6 +3562,7 @@ public function consumerRequestCountsAllRequest($consumer_id, $start_datetime, $
         // query params
 
         if ('raw' === 'end_datetime') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($end_datetime)) {
                 foreach($end_datetime as $key => $value) {
                     $queryParams[$key] = $value;
@@ -3521,7 +3573,23 @@ public function consumerRequestCountsAllRequest($consumer_id, $start_datetime, $
             }
         }
 
-        if ($end_datetime !== null && 'end_datetime' !== 'raw') {
+
+        if ($end_datetime !== null && 'sort' === 'end_datetime') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($end_datetime !== null && 'filter' === 'end_datetime') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($end_datetime !== null && !('end_datetime' === 'raw' || 'end_datetime' === 'sort' || 'end_datetime' === 'filter')) {
             if('form' === 'form' && is_array($end_datetime)) {
                 foreach($end_datetime as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4348,6 +4416,7 @@ public function consumersAllRequest($x_apideck_app_id = null, $cursor = null, $l
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4358,7 +4427,23 @@ public function consumersAllRequest($x_apideck_app_id = null, $cursor = null, $l
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4371,6 +4456,7 @@ public function consumersAllRequest($x_apideck_app_id = null, $cursor = null, $l
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -4381,7 +4467,23 @@ public function consumersAllRequest($x_apideck_app_id = null, $cursor = null, $l
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6039,6 +6141,7 @@ public function logsAllRequest($x_apideck_app_id = null, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6049,7 +6152,23 @@ public function logsAllRequest($x_apideck_app_id = null, $x_apideck_consumer_id
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6062,6 +6181,7 @@ public function logsAllRequest($x_apideck_app_id = null, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6072,7 +6192,23 @@ public function logsAllRequest($x_apideck_app_id = null, $x_apideck_consumer_id
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6085,6 +6221,7 @@ public function logsAllRequest($x_apideck_app_id = null, $x_apideck_consumer_id
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -6095,7 +6232,23 @@ public function logsAllRequest($x_apideck_app_id = null, $x_apideck_consumer_id
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Api/WebhookApi.php b/src/gen/lib/Api/WebhookApi.php
index 07d9a793e..4add7e7a8 100644
--- a/src/gen/lib/Api/WebhookApi.php
+++ b/src/gen/lib/Api/WebhookApi.php
@@ -456,6 +456,7 @@ public function eventLogsAllRequest($x_apideck_app_id = null, $cursor = null, $l
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -466,7 +467,23 @@ public function eventLogsAllRequest($x_apideck_app_id = null, $cursor = null, $l
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -479,6 +496,7 @@ public function eventLogsAllRequest($x_apideck_app_id = null, $cursor = null, $l
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -489,7 +507,23 @@ public function eventLogsAllRequest($x_apideck_app_id = null, $cursor = null, $l
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -502,6 +536,7 @@ public function eventLogsAllRequest($x_apideck_app_id = null, $cursor = null, $l
         // query params
 
         if ('raw' === 'filter') {
+            // Support for raw as true/false parameter
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -512,7 +547,23 @@ public function eventLogsAllRequest($x_apideck_app_id = null, $cursor = null, $l
             }
         }
 
-        if ($filter !== null && 'filter' !== 'raw') {
+
+        if ($filter !== null && 'sort' === 'filter') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($filter !== null && 'filter' === 'filter') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($filter !== null && !('filter' === 'raw' || 'filter' === 'sort' || 'filter' === 'filter')) {
             if('form' === 'deepObject' && is_array($filter)) {
                 foreach($filter as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1331,6 +1382,7 @@ public function webhooksAllRequest($x_apideck_app_id = null, $cursor = null, $li
         // query params
 
         if ('raw' === 'cursor') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1341,7 +1393,23 @@ public function webhooksAllRequest($x_apideck_app_id = null, $cursor = null, $li
             }
         }
 
-        if ($cursor !== null && 'cursor' !== 'raw') {
+
+        if ($cursor !== null && 'sort' === 'cursor') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($cursor !== null && 'filter' === 'cursor') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($cursor !== null && !('cursor' === 'raw' || 'cursor' === 'sort' || 'cursor' === 'filter')) {
             if('form' === 'form' && is_array($cursor)) {
                 foreach($cursor as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1354,6 +1422,7 @@ public function webhooksAllRequest($x_apideck_app_id = null, $cursor = null, $li
         // query params
 
         if ('raw' === 'limit') {
+            // Support for raw as true/false parameter
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
@@ -1364,7 +1433,23 @@ public function webhooksAllRequest($x_apideck_app_id = null, $cursor = null, $li
             }
         }
 
-        if ($limit !== null && 'limit' !== 'raw') {
+
+        if ($limit !== null && 'sort' === 'limit') {
+          // Support for sort options
+          $sort_data = $sort->jsonSerialize();
+          foreach($sort_data as $key => $value) {
+            $queryParams['sort['.$key.']'] = $value;
+          }
+        }
+
+        if ($limit !== null && 'filter' === 'limit') {
+          // Support for filter options
+          $filter_data = $filter->jsonSerialize();
+          foreach($filter_data as $key => $value) {
+            $queryParams['filter['.$key.']'] = $value;
+          }
+        }
+        if ($limit !== null && !('limit' === 'raw' || 'limit' === 'sort' || 'limit' === 'filter')) {
             if('form' === 'form' && is_array($limit)) {
                 foreach($limit as $key => $value) {
                     $queryParams[$key] = $value;
diff --git a/src/gen/lib/Configuration.php b/src/gen/lib/Configuration.php
index 0966ca699..e7dd64c02 100644
--- a/src/gen/lib/Configuration.php
+++ b/src/gen/lib/Configuration.php
@@ -97,7 +97,7 @@ class Configuration
      *
      * @var string
      */
-    protected $userAgent = 'OpenAPI-Generator/2.5.1/PHP';
+    protected $userAgent = 'OpenAPI-Generator/2.5.2/PHP';
 
     /**
      * Debug switch (default set to false)
@@ -448,7 +448,7 @@ public static function toDebugReport()
         $report .= '    OS: ' . php_uname() . PHP_EOL;
         $report .= '    PHP Version: ' . PHP_VERSION . PHP_EOL;
         $report .= '    The version of the OpenAPI document: 9.9.0' . PHP_EOL;
-        $report .= '    SDK Package Version: 2.5.1' . PHP_EOL;
+        $report .= '    SDK Package Version: 2.5.2' . PHP_EOL;
         $report .= '    Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
 
         return $report;