From cfd08218bc035d76cf107978ba0ac15355db32f0 Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Mon, 22 Jun 2026 15:38:21 -0700
Subject: [PATCH 1/9] Regenerate against latest spec: moderation tenantId +
 broadcastId params (v2.1.0)

Rebuilt on current main: the prior regen-moderation-api branch had diverged from
pre-2.0.0 main, which regressed the package version to 1.3.1 and dropped the v2.0.x
LICENSE + SSO-helper bundling. Adds the optional tenantId/broadcastId moderation query
params and bumps the package 2.0.1 -> 2.1.0 (additive). LICENSE + SSO preserved by update.py.
---
 client/doc/ModerationApi.md          | 280 ++++++++----
 client/lib/api/moderation_api.dart   | 636 +++++++++++++++++++++------
 client/pubspec.yaml                  |   2 +-
 client/test/moderation_api_test.dart |  86 ++--
 config.json                          |   2 +-
 openapi.json                         | 432 ++++++++++++++++++
 6 files changed, 1178 insertions(+), 260 deletions(-)

diff --git a/client/doc/ModerationApi.md b/client/doc/ModerationApi.md
index 84827de..b9e807d 100644
--- a/client/doc/ModerationApi.md
+++ b/client/doc/ModerationApi.md
@@ -55,7 +55,7 @@ Method | HTTP request | Description
 
 
 # **deleteModerationVote**
-> VoteDeleteResponse deleteModerationVote(commentId, voteId, sso)
+> VoteDeleteResponse deleteModerationVote(commentId, voteId, broadcastId, tenantId, sso)
 
 
 
@@ -66,10 +66,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final voteId = voteId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteModerationVote(commentId, voteId, sso);
+    final result = api_instance.deleteModerationVote(commentId, voteId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->deleteModerationVote: $e\n');
@@ -82,6 +84,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **voteId** | **String**|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -100,7 +104,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiComments**
-> ModerationAPIGetCommentsResponse getApiComments(page, count, textSearch, byIPFromComment, filters, searchFilters, sorts, demo, sso)
+> ModerationAPIGetCommentsResponse getApiComments(page, count, textSearch, byIPFromComment, filters, searchFilters, sorts, demo, tenantId, sso)
 
 
 
@@ -117,10 +121,11 @@ final filters = filters_example; // String |
 final searchFilters = searchFilters_example; // String | 
 final sorts = sorts_example; // String | 
 final demo = true; // bool | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiComments(page, count, textSearch, byIPFromComment, filters, searchFilters, sorts, demo, sso);
+    final result = api_instance.getApiComments(page, count, textSearch, byIPFromComment, filters, searchFilters, sorts, demo, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiComments: $e\n');
@@ -139,6 +144,7 @@ Name | Type | Description  | Notes
  **searchFilters** | **String**|  | [optional] 
  **sorts** | **String**|  | [optional] 
  **demo** | **bool**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -157,7 +163,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiExportStatus**
-> ModerationExportStatusResponse getApiExportStatus(batchJobId, sso)
+> ModerationExportStatusResponse getApiExportStatus(batchJobId, tenantId, sso)
 
 
 
@@ -167,10 +173,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final batchJobId = batchJobId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiExportStatus(batchJobId, sso);
+    final result = api_instance.getApiExportStatus(batchJobId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiExportStatus: $e\n');
@@ -182,6 +189,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **batchJobId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -200,7 +208,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiIds**
-> ModerationAPIGetCommentIdsResponse getApiIds(textSearch, byIPFromComment, filters, searchFilters, afterId, demo, sso)
+> ModerationAPIGetCommentIdsResponse getApiIds(textSearch, byIPFromComment, filters, searchFilters, afterId, demo, tenantId, sso)
 
 
 
@@ -215,10 +223,11 @@ final filters = filters_example; // String |
 final searchFilters = searchFilters_example; // String | 
 final afterId = afterId_example; // String | 
 final demo = true; // bool | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiIds(textSearch, byIPFromComment, filters, searchFilters, afterId, demo, sso);
+    final result = api_instance.getApiIds(textSearch, byIPFromComment, filters, searchFilters, afterId, demo, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiIds: $e\n');
@@ -235,6 +244,7 @@ Name | Type | Description  | Notes
  **searchFilters** | **String**|  | [optional] 
  **afterId** | **String**|  | [optional] 
  **demo** | **bool**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -253,7 +263,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getBanUsersFromComment**
-> GetBannedUsersFromCommentResponse getBanUsersFromComment(commentId, sso)
+> GetBannedUsersFromCommentResponse getBanUsersFromComment(commentId, tenantId, sso)
 
 
 
@@ -263,10 +273,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getBanUsersFromComment(commentId, sso);
+    final result = api_instance.getBanUsersFromComment(commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getBanUsersFromComment: $e\n');
@@ -278,6 +289,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -296,7 +308,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentBanStatus**
-> GetCommentBanStatusResponse getCommentBanStatus(commentId, sso)
+> GetCommentBanStatusResponse getCommentBanStatus(commentId, tenantId, sso)
 
 
 
@@ -306,10 +318,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentBanStatus(commentId, sso);
+    final result = api_instance.getCommentBanStatus(commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentBanStatus: $e\n');
@@ -321,6 +334,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -339,7 +353,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentChildren**
-> ModerationAPIChildCommentsResponse getCommentChildren(commentId, sso)
+> ModerationAPIChildCommentsResponse getCommentChildren(commentId, tenantId, sso)
 
 
 
@@ -349,10 +363,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentChildren(commentId, sso);
+    final result = api_instance.getCommentChildren(commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentChildren: $e\n');
@@ -364,6 +379,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -382,7 +398,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCount**
-> ModerationAPICountCommentsResponse getCount(textSearch, byIPFromComment, filter, searchFilters, demo, sso)
+> ModerationAPICountCommentsResponse getCount(textSearch, byIPFromComment, filter, searchFilters, demo, tenantId, sso)
 
 
 
@@ -396,10 +412,11 @@ final byIPFromComment = byIPFromComment_example; // String |
 final filter = filter_example; // String | 
 final searchFilters = searchFilters_example; // String | 
 final demo = true; // bool | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCount(textSearch, byIPFromComment, filter, searchFilters, demo, sso);
+    final result = api_instance.getCount(textSearch, byIPFromComment, filter, searchFilters, demo, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCount: $e\n');
@@ -415,6 +432,7 @@ Name | Type | Description  | Notes
  **filter** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
  **demo** | **bool**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -433,7 +451,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCounts**
-> GetBannedUsersCountResponse getCounts(sso)
+> GetBannedUsersCountResponse getCounts(tenantId, sso)
 
 
 
@@ -442,10 +460,11 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCounts(sso);
+    final result = api_instance.getCounts(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCounts: $e\n');
@@ -456,6 +475,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -474,7 +494,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getLogs**
-> ModerationAPIGetLogsResponse getLogs(commentId, sso)
+> ModerationAPIGetLogsResponse getLogs(commentId, tenantId, sso)
 
 
 
@@ -484,10 +504,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getLogs(commentId, sso);
+    final result = api_instance.getLogs(commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getLogs: $e\n');
@@ -499,6 +520,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -517,7 +539,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadges**
-> GetTenantManualBadgesResponse getManualBadges(sso)
+> GetTenantManualBadgesResponse getManualBadges(tenantId, sso)
 
 
 
@@ -526,10 +548,11 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadges(sso);
+    final result = api_instance.getManualBadges(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadges: $e\n');
@@ -540,6 +563,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -558,7 +582,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadgesForUser**
-> GetUserManualBadgesResponse getManualBadgesForUser(badgesUserId, commentId, sso)
+> GetUserManualBadgesResponse getManualBadgesForUser(badgesUserId, commentId, tenantId, sso)
 
 
 
@@ -569,10 +593,11 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final badgesUserId = badgesUserId_example; // String | 
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadgesForUser(badgesUserId, commentId, sso);
+    final result = api_instance.getManualBadgesForUser(badgesUserId, commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadgesForUser: $e\n');
@@ -585,6 +610,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **badgesUserId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -603,7 +629,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationComment**
-> ModerationAPICommentResponse getModerationComment(commentId, includeEmail, includeIP, sso)
+> ModerationAPICommentResponse getModerationComment(commentId, includeEmail, includeIP, tenantId, sso)
 
 
 
@@ -615,10 +641,11 @@ final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final includeEmail = true; // bool | 
 final includeIP = true; // bool | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationComment(commentId, includeEmail, includeIP, sso);
+    final result = api_instance.getModerationComment(commentId, includeEmail, includeIP, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationComment: $e\n');
@@ -632,6 +659,7 @@ Name | Type | Description  | Notes
  **commentId** | **String**|  | 
  **includeEmail** | **bool**|  | [optional] 
  **includeIP** | **bool**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -650,7 +678,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationCommentText**
-> GetCommentTextResponse getModerationCommentText(commentId, sso)
+> GetCommentTextResponse getModerationCommentText(commentId, tenantId, sso)
 
 
 
@@ -660,10 +688,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationCommentText(commentId, sso);
+    final result = api_instance.getModerationCommentText(commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationCommentText: $e\n');
@@ -675,6 +704,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -693,7 +723,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPreBanSummary**
-> PreBanSummary getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, sso)
+> PreBanSummary getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso)
 
 
 
@@ -706,10 +736,11 @@ final commentId = commentId_example; // String |
 final includeByUserIdAndEmail = true; // bool | 
 final includeByIP = true; // bool | 
 final includeByEmailDomain = true; // bool | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, sso);
+    final result = api_instance.getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getPreBanSummary: $e\n');
@@ -724,6 +755,7 @@ Name | Type | Description  | Notes
  **includeByUserIdAndEmail** | **bool**|  | [optional] 
  **includeByIP** | **bool**|  | [optional] 
  **includeByEmailDomain** | **bool**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -742,7 +774,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchCommentsSummary**
-> ModerationCommentSearchResponse getSearchCommentsSummary(value, filters, searchFilters, sso)
+> ModerationCommentSearchResponse getSearchCommentsSummary(value, filters, searchFilters, tenantId, sso)
 
 
 
@@ -754,10 +786,11 @@ final api_instance = ModerationApi();
 final value = value_example; // String | 
 final filters = filters_example; // String | 
 final searchFilters = searchFilters_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchCommentsSummary(value, filters, searchFilters, sso);
+    final result = api_instance.getSearchCommentsSummary(value, filters, searchFilters, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchCommentsSummary: $e\n');
@@ -771,6 +804,7 @@ Name | Type | Description  | Notes
  **value** | **String**|  | [optional] 
  **filters** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -789,7 +823,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchPages**
-> ModerationPageSearchResponse getSearchPages(value, sso)
+> ModerationPageSearchResponse getSearchPages(value, tenantId, sso)
 
 
 
@@ -799,10 +833,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final value = value_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchPages(value, sso);
+    final result = api_instance.getSearchPages(value, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchPages: $e\n');
@@ -814,6 +849,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **value** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -832,7 +868,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSites**
-> ModerationSiteSearchResponse getSearchSites(value, sso)
+> ModerationSiteSearchResponse getSearchSites(value, tenantId, sso)
 
 
 
@@ -842,10 +878,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final value = value_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSites(value, sso);
+    final result = api_instance.getSearchSites(value, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSites: $e\n');
@@ -857,6 +894,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **value** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -875,7 +913,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSuggest**
-> ModerationSuggestResponse getSearchSuggest(textSearch, sso)
+> ModerationSuggestResponse getSearchSuggest(textSearch, tenantId, sso)
 
 
 
@@ -885,10 +923,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final textSearch = textSearch_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSuggest(textSearch, sso);
+    final result = api_instance.getSearchSuggest(textSearch, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSuggest: $e\n');
@@ -900,6 +939,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **textSearch** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -918,7 +958,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchUsers**
-> ModerationUserSearchResponse getSearchUsers(value, sso)
+> ModerationUserSearchResponse getSearchUsers(value, tenantId, sso)
 
 
 
@@ -928,10 +968,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final value = value_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchUsers(value, sso);
+    final result = api_instance.getSearchUsers(value, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchUsers: $e\n');
@@ -943,6 +984,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **value** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -961,7 +1003,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTrustFactor**
-> GetUserTrustFactorResponse getTrustFactor(userId, sso)
+> GetUserTrustFactorResponse getTrustFactor(userId, tenantId, sso)
 
 
 
@@ -971,10 +1013,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final userId = userId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getTrustFactor(userId, sso);
+    final result = api_instance.getTrustFactor(userId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getTrustFactor: $e\n');
@@ -986,6 +1029,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **userId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1004,7 +1048,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBanPreference**
-> APIModerateGetUserBanPreferencesResponse getUserBanPreference(sso)
+> APIModerateGetUserBanPreferencesResponse getUserBanPreference(tenantId, sso)
 
 
 
@@ -1013,10 +1057,11 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserBanPreference(sso);
+    final result = api_instance.getUserBanPreference(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserBanPreference: $e\n');
@@ -1027,6 +1072,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1045,7 +1091,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserInternalProfile**
-> GetUserInternalProfileResponse getUserInternalProfile(commentId, sso)
+> GetUserInternalProfileResponse getUserInternalProfile(commentId, tenantId, sso)
 
 
 
@@ -1055,10 +1101,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserInternalProfile(commentId, sso);
+    final result = api_instance.getUserInternalProfile(commentId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserInternalProfile: $e\n');
@@ -1070,6 +1117,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1088,7 +1136,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postAdjustCommentVotes**
-> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, sso)
+> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, broadcastId, tenantId, sso)
 
 
 
@@ -1099,10 +1147,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final adjustCommentVotesParams = AdjustCommentVotesParams(); // AdjustCommentVotesParams | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, sso);
+    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postAdjustCommentVotes: $e\n');
@@ -1115,6 +1165,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **adjustCommentVotesParams** | [**AdjustCommentVotesParams**](AdjustCommentVotesParams.md)|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1133,7 +1185,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postApiExport**
-> ModerationExportResponse postApiExport(textSearch, byIPFromComment, filters, searchFilters, sorts, sso)
+> ModerationExportResponse postApiExport(textSearch, byIPFromComment, filters, searchFilters, sorts, tenantId, sso)
 
 
 
@@ -1147,10 +1199,11 @@ final byIPFromComment = byIPFromComment_example; // String |
 final filters = filters_example; // String | 
 final searchFilters = searchFilters_example; // String | 
 final sorts = sorts_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postApiExport(textSearch, byIPFromComment, filters, searchFilters, sorts, sso);
+    final result = api_instance.postApiExport(textSearch, byIPFromComment, filters, searchFilters, sorts, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postApiExport: $e\n');
@@ -1166,6 +1219,7 @@ Name | Type | Description  | Notes
  **filters** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
  **sorts** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1184,7 +1238,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserFromComment**
-> BanUserFromCommentResult postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, sso)
+> BanUserFromCommentResult postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, tenantId, sso)
 
 
 
@@ -1202,10 +1256,11 @@ final bannedUntil = bannedUntil_example; // String |
 final isShadowBan = true; // bool | 
 final updateId = updateId_example; // String | 
 final banReason = banReason_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, sso);
+    final result = api_instance.postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserFromComment: $e\n');
@@ -1225,6 +1280,7 @@ Name | Type | Description  | Notes
  **isShadowBan** | **bool**|  | [optional] 
  **updateId** | **String**|  | [optional] 
  **banReason** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1243,7 +1299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserUndo**
-> APIEmptyResponse postBanUserUndo(banUserUndoParams, sso)
+> APIEmptyResponse postBanUserUndo(banUserUndoParams, tenantId, sso)
 
 
 
@@ -1253,10 +1309,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final banUserUndoParams = BanUserUndoParams(); // BanUserUndoParams | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserUndo(banUserUndoParams, sso);
+    final result = api_instance.postBanUserUndo(banUserUndoParams, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserUndo: $e\n');
@@ -1268,6 +1325,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **banUserUndoParams** | [**BanUserUndoParams**](BanUserUndoParams.md)|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1286,7 +1344,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBulkPreBanSummary**
-> BulkPreBanSummary postBulkPreBanSummary(bulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, sso)
+> BulkPreBanSummary postBulkPreBanSummary(bulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso)
 
 
 
@@ -1299,10 +1357,11 @@ final bulkPreBanParams = BulkPreBanParams(); // BulkPreBanParams |
 final includeByUserIdAndEmail = true; // bool | 
 final includeByIP = true; // bool | 
 final includeByEmailDomain = true; // bool | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBulkPreBanSummary(bulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, sso);
+    final result = api_instance.postBulkPreBanSummary(bulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBulkPreBanSummary: $e\n');
@@ -1317,6 +1376,7 @@ Name | Type | Description  | Notes
  **includeByUserIdAndEmail** | **bool**|  | [optional] 
  **includeByIP** | **bool**|  | [optional] 
  **includeByEmailDomain** | **bool**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1335,7 +1395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postCommentsByIds**
-> ModerationAPIChildCommentsResponse postCommentsByIds(commentsByIdsParams, sso)
+> ModerationAPIChildCommentsResponse postCommentsByIds(commentsByIdsParams, tenantId, sso)
 
 
 
@@ -1345,10 +1405,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentsByIdsParams = CommentsByIdsParams(); // CommentsByIdsParams | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postCommentsByIds(commentsByIdsParams, sso);
+    final result = api_instance.postCommentsByIds(commentsByIdsParams, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postCommentsByIds: $e\n');
@@ -1360,6 +1421,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentsByIdsParams** | [**CommentsByIdsParams**](CommentsByIdsParams.md)|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1378,7 +1440,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postFlagComment**
-> APIEmptyResponse postFlagComment(commentId, sso)
+> APIEmptyResponse postFlagComment(commentId, broadcastId, tenantId, sso)
 
 
 
@@ -1388,10 +1450,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postFlagComment(commentId, sso);
+    final result = api_instance.postFlagComment(commentId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postFlagComment: $e\n');
@@ -1403,6 +1467,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1421,7 +1487,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRemoveComment**
-> PostRemoveCommentResponse postRemoveComment(commentId, sso)
+> PostRemoveCommentResponse postRemoveComment(commentId, broadcastId, tenantId, sso)
 
 
 
@@ -1431,10 +1497,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRemoveComment(commentId, sso);
+    final result = api_instance.postRemoveComment(commentId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRemoveComment: $e\n');
@@ -1446,6 +1514,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1464,7 +1534,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRestoreDeletedComment**
-> APIEmptyResponse postRestoreDeletedComment(commentId, sso)
+> APIEmptyResponse postRestoreDeletedComment(commentId, broadcastId, tenantId, sso)
 
 
 
@@ -1474,10 +1544,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRestoreDeletedComment(commentId, sso);
+    final result = api_instance.postRestoreDeletedComment(commentId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRestoreDeletedComment: $e\n');
@@ -1489,6 +1561,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1507,7 +1581,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentApprovalStatus**
-> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, approved, sso)
+> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, approved, broadcastId, tenantId, sso)
 
 
 
@@ -1518,10 +1592,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final approved = true; // bool | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentApprovalStatus(commentId, approved, sso);
+    final result = api_instance.postSetCommentApprovalStatus(commentId, approved, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentApprovalStatus: $e\n');
@@ -1534,6 +1610,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **approved** | **bool**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1552,7 +1630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentReviewStatus**
-> APIEmptyResponse postSetCommentReviewStatus(commentId, reviewed, sso)
+> APIEmptyResponse postSetCommentReviewStatus(commentId, reviewed, broadcastId, tenantId, sso)
 
 
 
@@ -1563,10 +1641,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final reviewed = true; // bool | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentReviewStatus(commentId, reviewed, sso);
+    final result = api_instance.postSetCommentReviewStatus(commentId, reviewed, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentReviewStatus: $e\n');
@@ -1579,6 +1659,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **reviewed** | **bool**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1597,7 +1679,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentSpamStatus**
-> APIEmptyResponse postSetCommentSpamStatus(commentId, spam, permNotSpam, sso)
+> APIEmptyResponse postSetCommentSpamStatus(commentId, spam, permNotSpam, broadcastId, tenantId, sso)
 
 
 
@@ -1609,10 +1691,12 @@ final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final spam = true; // bool | 
 final permNotSpam = true; // bool | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentSpamStatus(commentId, spam, permNotSpam, sso);
+    final result = api_instance.postSetCommentSpamStatus(commentId, spam, permNotSpam, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentSpamStatus: $e\n');
@@ -1626,6 +1710,8 @@ Name | Type | Description  | Notes
  **commentId** | **String**|  | 
  **spam** | **bool**|  | [optional] 
  **permNotSpam** | **bool**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1644,7 +1730,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentText**
-> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, sso)
+> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, broadcastId, tenantId, sso)
 
 
 
@@ -1655,10 +1741,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final setCommentTextParams = SetCommentTextParams(); // SetCommentTextParams | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, sso);
+    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentText: $e\n');
@@ -1671,6 +1759,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **setCommentTextParams** | [**SetCommentTextParams**](SetCommentTextParams.md)|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1689,7 +1779,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postUnFlagComment**
-> APIEmptyResponse postUnFlagComment(commentId, sso)
+> APIEmptyResponse postUnFlagComment(commentId, broadcastId, tenantId, sso)
 
 
 
@@ -1699,10 +1789,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postUnFlagComment(commentId, sso);
+    final result = api_instance.postUnFlagComment(commentId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postUnFlagComment: $e\n');
@@ -1714,6 +1806,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1732,7 +1826,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postVote**
-> VoteResponse postVote(commentId, direction, sso)
+> VoteResponse postVote(commentId, direction, broadcastId, tenantId, sso)
 
 
 
@@ -1743,10 +1837,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final direction = direction_example; // String | 
+final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postVote(commentId, direction, sso);
+    final result = api_instance.postVote(commentId, direction, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postVote: $e\n');
@@ -1759,6 +1855,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **direction** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1777,7 +1875,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putAwardBadge**
-> AwardUserBadgeResponse putAwardBadge(badgeId, userId, commentId, broadcastId, sso)
+> AwardUserBadgeResponse putAwardBadge(badgeId, userId, commentId, broadcastId, tenantId, sso)
 
 
 
@@ -1790,10 +1888,11 @@ final badgeId = badgeId_example; // String |
 final userId = userId_example; // String | 
 final commentId = commentId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putAwardBadge(badgeId, userId, commentId, broadcastId, sso);
+    final result = api_instance.putAwardBadge(badgeId, userId, commentId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putAwardBadge: $e\n');
@@ -1808,6 +1907,7 @@ Name | Type | Description  | Notes
  **userId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1826,7 +1926,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putCloseThread**
-> APIEmptyResponse putCloseThread(urlId, sso)
+> APIEmptyResponse putCloseThread(urlId, tenantId, sso)
 
 
 
@@ -1836,10 +1936,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final urlId = urlId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putCloseThread(urlId, sso);
+    final result = api_instance.putCloseThread(urlId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putCloseThread: $e\n');
@@ -1851,6 +1952,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **urlId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1869,7 +1971,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putRemoveBadge**
-> RemoveUserBadgeResponse putRemoveBadge(badgeId, userId, commentId, broadcastId, sso)
+> RemoveUserBadgeResponse putRemoveBadge(badgeId, userId, commentId, broadcastId, tenantId, sso)
 
 
 
@@ -1882,10 +1984,11 @@ final badgeId = badgeId_example; // String |
 final userId = userId_example; // String | 
 final commentId = commentId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putRemoveBadge(badgeId, userId, commentId, broadcastId, sso);
+    final result = api_instance.putRemoveBadge(badgeId, userId, commentId, broadcastId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putRemoveBadge: $e\n');
@@ -1900,6 +2003,7 @@ Name | Type | Description  | Notes
  **userId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1918,7 +2022,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putReopenThread**
-> APIEmptyResponse putReopenThread(urlId, sso)
+> APIEmptyResponse putReopenThread(urlId, tenantId, sso)
 
 
 
@@ -1928,10 +2032,11 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final urlId = urlId_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putReopenThread(urlId, sso);
+    final result = api_instance.putReopenThread(urlId, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putReopenThread: $e\n');
@@ -1943,6 +2048,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **urlId** | **String**|  | 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1961,7 +2067,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setTrustFactor**
-> SetUserTrustFactorResponse setTrustFactor(userId, trustFactor, sso)
+> SetUserTrustFactorResponse setTrustFactor(userId, trustFactor, tenantId, sso)
 
 
 
@@ -1972,10 +2078,11 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final userId = userId_example; // String | 
 final trustFactor = trustFactor_example; // String | 
+final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setTrustFactor(userId, trustFactor, sso);
+    final result = api_instance.setTrustFactor(userId, trustFactor, tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->setTrustFactor: $e\n');
@@ -1988,6 +2095,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **userId** | **String**|  | [optional] 
  **trustFactor** | **String**|  | [optional] 
+ **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
diff --git a/client/lib/api/moderation_api.dart b/client/lib/api/moderation_api.dart
index 1727b6a..1e6c33d 100644
--- a/client/lib/api/moderation_api.dart
+++ b/client/lib/api/moderation_api.dart
@@ -23,8 +23,12 @@ class ModerationApi {
   ///
   /// * [String] voteId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, { String? sso, }) async {
+  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/vote/{commentId}/{voteId}'
       .replaceAll('{commentId}', commentId)
@@ -37,6 +41,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -61,9 +71,13 @@ class ModerationApi {
   ///
   /// * [String] voteId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, { String? sso, }) async {
-    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId,  sso: sso, );
+  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -96,8 +110,10 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getApiCommentsWithHttpInfo({ double? page, double? count, String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, bool? demo, String? sso, }) async {
+  Future<Response> getApiCommentsWithHttpInfo({ double? page, double? count, String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, bool? demo, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/comments';
 
@@ -132,6 +148,9 @@ class ModerationApi {
     if (demo != null) {
       queryParams.addAll(_queryParams('', 'demo', demo));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -168,9 +187,11 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentsResponse?> getApiComments({ double? page, double? count, String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, bool? demo, String? sso, }) async {
-    final response = await getApiCommentsWithHttpInfo( page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, sso: sso, );
+  Future<ModerationAPIGetCommentsResponse?> getApiComments({ double? page, double? count, String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, bool? demo, String? tenantId, String? sso, }) async {
+    final response = await getApiCommentsWithHttpInfo( page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -189,8 +210,10 @@ class ModerationApi {
   ///
   /// * [String] batchJobId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getApiExportStatusWithHttpInfo({ String? batchJobId, String? sso, }) async {
+  Future<Response> getApiExportStatusWithHttpInfo({ String? batchJobId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/export/status';
 
@@ -204,6 +227,9 @@ class ModerationApi {
     if (batchJobId != null) {
       queryParams.addAll(_queryParams('', 'batchJobId', batchJobId));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -226,9 +252,11 @@ class ModerationApi {
   ///
   /// * [String] batchJobId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationExportStatusResponse?> getApiExportStatus({ String? batchJobId, String? sso, }) async {
-    final response = await getApiExportStatusWithHttpInfo( batchJobId: batchJobId, sso: sso, );
+  Future<ModerationExportStatusResponse?> getApiExportStatus({ String? batchJobId, String? tenantId, String? sso, }) async {
+    final response = await getApiExportStatusWithHttpInfo( batchJobId: batchJobId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -257,8 +285,10 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getApiIdsWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? afterId, bool? demo, String? sso, }) async {
+  Future<Response> getApiIdsWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? afterId, bool? demo, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/ids';
 
@@ -287,6 +317,9 @@ class ModerationApi {
     if (demo != null) {
       queryParams.addAll(_queryParams('', 'demo', demo));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -319,9 +352,11 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentIdsResponse?> getApiIds({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? afterId, bool? demo, String? sso, }) async {
-    final response = await getApiIdsWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, sso: sso, );
+  Future<ModerationAPIGetCommentIdsResponse?> getApiIds({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? afterId, bool? demo, String? tenantId, String? sso, }) async {
+    final response = await getApiIdsWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -340,8 +375,10 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-users/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -353,6 +390,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -375,9 +415,11 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, { String? sso, }) async {
-    final response = await getBanUsersFromCommentWithHttpInfo(commentId,  sso: sso, );
+  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, { String? tenantId, String? sso, }) async {
+    final response = await getBanUsersFromCommentWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -396,8 +438,10 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-comment-ban-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -409,6 +453,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -431,9 +478,11 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, { String? sso, }) async {
-    final response = await getCommentBanStatusWithHttpInfo(commentId,  sso: sso, );
+  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, { String? tenantId, String? sso, }) async {
+    final response = await getCommentBanStatusWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -452,8 +501,10 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getCommentChildrenWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> getCommentChildrenWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comment-children/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -465,6 +516,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -487,9 +541,11 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, { String? sso, }) async {
-    final response = await getCommentChildrenWithHttpInfo(commentId,  sso: sso, );
+  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, { String? tenantId, String? sso, }) async {
+    final response = await getCommentChildrenWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -516,8 +572,10 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getCountWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filter, String? searchFilters, bool? demo, String? sso, }) async {
+  Future<Response> getCountWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filter, String? searchFilters, bool? demo, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/count';
 
@@ -543,6 +601,9 @@ class ModerationApi {
     if (demo != null) {
       queryParams.addAll(_queryParams('', 'demo', demo));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -573,9 +634,11 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPICountCommentsResponse?> getCount({ String? textSearch, String? byIPFromComment, String? filter, String? searchFilters, bool? demo, String? sso, }) async {
-    final response = await getCountWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, sso: sso, );
+  Future<ModerationAPICountCommentsResponse?> getCount({ String? textSearch, String? byIPFromComment, String? filter, String? searchFilters, bool? demo, String? tenantId, String? sso, }) async {
+    final response = await getCountWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -592,8 +655,10 @@ class ModerationApi {
   /// Performs an HTTP 'GET /auth/my-account/moderate-comments/banned-users/counts' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getCountsWithHttpInfo({ String? sso, }) async {
+  Future<Response> getCountsWithHttpInfo({ String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/banned-users/counts';
 
@@ -604,6 +669,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -624,9 +692,11 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetBannedUsersCountResponse?> getCounts({ String? sso, }) async {
-    final response = await getCountsWithHttpInfo( sso: sso, );
+  Future<GetBannedUsersCountResponse?> getCounts({ String? tenantId, String? sso, }) async {
+    final response = await getCountsWithHttpInfo( tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -645,8 +715,10 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getLogsWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> getLogsWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/logs/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -658,6 +730,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -680,9 +755,11 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, { String? sso, }) async {
-    final response = await getLogsWithHttpInfo(commentId,  sso: sso, );
+  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, { String? tenantId, String? sso, }) async {
+    final response = await getLogsWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -699,8 +776,10 @@ class ModerationApi {
   /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-manual-badges' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getManualBadgesWithHttpInfo({ String? sso, }) async {
+  Future<Response> getManualBadgesWithHttpInfo({ String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-manual-badges';
 
@@ -711,6 +790,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -731,9 +813,11 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetTenantManualBadgesResponse?> getManualBadges({ String? sso, }) async {
-    final response = await getManualBadgesWithHttpInfo( sso: sso, );
+  Future<GetTenantManualBadgesResponse?> getManualBadges({ String? tenantId, String? sso, }) async {
+    final response = await getManualBadgesWithHttpInfo( tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -754,8 +838,10 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getManualBadgesForUserWithHttpInfo({ String? badgesUserId, String? commentId, String? sso, }) async {
+  Future<Response> getManualBadgesForUserWithHttpInfo({ String? badgesUserId, String? commentId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-manual-badges-for-user';
 
@@ -772,6 +858,9 @@ class ModerationApi {
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -796,9 +885,11 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetUserManualBadgesResponse?> getManualBadgesForUser({ String? badgesUserId, String? commentId, String? sso, }) async {
-    final response = await getManualBadgesForUserWithHttpInfo( badgesUserId: badgesUserId, commentId: commentId, sso: sso, );
+  Future<GetUserManualBadgesResponse?> getManualBadgesForUser({ String? badgesUserId, String? commentId, String? tenantId, String? sso, }) async {
+    final response = await getManualBadgesForUserWithHttpInfo( badgesUserId: badgesUserId, commentId: commentId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -821,8 +912,10 @@ class ModerationApi {
   ///
   /// * [bool] includeIP:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getModerationCommentWithHttpInfo(String commentId, { bool? includeEmail, bool? includeIP, String? sso, }) async {
+  Future<Response> getModerationCommentWithHttpInfo(String commentId, { bool? includeEmail, bool? includeIP, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -840,6 +933,9 @@ class ModerationApi {
     if (includeIP != null) {
       queryParams.addAll(_queryParams('', 'includeIP', includeIP));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -866,9 +962,11 @@ class ModerationApi {
   ///
   /// * [bool] includeIP:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, { bool? includeEmail, bool? includeIP, String? sso, }) async {
-    final response = await getModerationCommentWithHttpInfo(commentId,  includeEmail: includeEmail, includeIP: includeIP, sso: sso, );
+  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, { bool? includeEmail, bool? includeIP, String? tenantId, String? sso, }) async {
+    final response = await getModerationCommentWithHttpInfo(commentId,  includeEmail: includeEmail, includeIP: includeIP, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -887,8 +985,10 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -900,6 +1000,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -922,9 +1025,11 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, { String? sso, }) async {
-    final response = await getModerationCommentTextWithHttpInfo(commentId,  sso: sso, );
+  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, { String? tenantId, String? sso, }) async {
+    final response = await getModerationCommentTextWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -949,8 +1054,10 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? sso, }) async {
+  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/pre-ban-summary/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -971,6 +1078,9 @@ class ModerationApi {
     if (includeByEmailDomain != null) {
       queryParams.addAll(_queryParams('', 'includeByEmailDomain', includeByEmailDomain));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -999,9 +1109,11 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<PreBanSummary?> getPreBanSummary(String commentId, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? sso, }) async {
-    final response = await getPreBanSummaryWithHttpInfo(commentId,  includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, sso: sso, );
+  Future<PreBanSummary?> getPreBanSummary(String commentId, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
+    final response = await getPreBanSummaryWithHttpInfo(commentId,  includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1024,8 +1136,10 @@ class ModerationApi {
   ///
   /// * [String] searchFilters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getSearchCommentsSummaryWithHttpInfo({ String? value, String? filters, String? searchFilters, String? sso, }) async {
+  Future<Response> getSearchCommentsSummaryWithHttpInfo({ String? value, String? filters, String? searchFilters, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/comments/summary';
 
@@ -1045,6 +1159,9 @@ class ModerationApi {
     if (searchFilters != null) {
       queryParams.addAll(_queryParams('', 'searchFilters', searchFilters));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1071,9 +1188,11 @@ class ModerationApi {
   ///
   /// * [String] searchFilters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary({ String? value, String? filters, String? searchFilters, String? sso, }) async {
-    final response = await getSearchCommentsSummaryWithHttpInfo( value: value, filters: filters, searchFilters: searchFilters, sso: sso, );
+  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary({ String? value, String? filters, String? searchFilters, String? tenantId, String? sso, }) async {
+    final response = await getSearchCommentsSummaryWithHttpInfo( value: value, filters: filters, searchFilters: searchFilters, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1092,8 +1211,10 @@ class ModerationApi {
   ///
   /// * [String] value:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getSearchPagesWithHttpInfo({ String? value, String? sso, }) async {
+  Future<Response> getSearchPagesWithHttpInfo({ String? value, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/pages';
 
@@ -1107,6 +1228,9 @@ class ModerationApi {
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1129,9 +1253,11 @@ class ModerationApi {
   ///
   /// * [String] value:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationPageSearchResponse?> getSearchPages({ String? value, String? sso, }) async {
-    final response = await getSearchPagesWithHttpInfo( value: value, sso: sso, );
+  Future<ModerationPageSearchResponse?> getSearchPages({ String? value, String? tenantId, String? sso, }) async {
+    final response = await getSearchPagesWithHttpInfo( value: value, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1150,8 +1276,10 @@ class ModerationApi {
   ///
   /// * [String] value:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getSearchSitesWithHttpInfo({ String? value, String? sso, }) async {
+  Future<Response> getSearchSitesWithHttpInfo({ String? value, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/sites';
 
@@ -1165,6 +1293,9 @@ class ModerationApi {
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1187,9 +1318,11 @@ class ModerationApi {
   ///
   /// * [String] value:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationSiteSearchResponse?> getSearchSites({ String? value, String? sso, }) async {
-    final response = await getSearchSitesWithHttpInfo( value: value, sso: sso, );
+  Future<ModerationSiteSearchResponse?> getSearchSites({ String? value, String? tenantId, String? sso, }) async {
+    final response = await getSearchSitesWithHttpInfo( value: value, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1208,8 +1341,10 @@ class ModerationApi {
   ///
   /// * [String] textSearch:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getSearchSuggestWithHttpInfo({ String? textSearch, String? sso, }) async {
+  Future<Response> getSearchSuggestWithHttpInfo({ String? textSearch, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/suggest';
 
@@ -1223,6 +1358,9 @@ class ModerationApi {
     if (textSearch != null) {
       queryParams.addAll(_queryParams('', 'text-search', textSearch));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1245,9 +1383,11 @@ class ModerationApi {
   ///
   /// * [String] textSearch:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationSuggestResponse?> getSearchSuggest({ String? textSearch, String? sso, }) async {
-    final response = await getSearchSuggestWithHttpInfo( textSearch: textSearch, sso: sso, );
+  Future<ModerationSuggestResponse?> getSearchSuggest({ String? textSearch, String? tenantId, String? sso, }) async {
+    final response = await getSearchSuggestWithHttpInfo( textSearch: textSearch, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1266,8 +1406,10 @@ class ModerationApi {
   ///
   /// * [String] value:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getSearchUsersWithHttpInfo({ String? value, String? sso, }) async {
+  Future<Response> getSearchUsersWithHttpInfo({ String? value, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/users';
 
@@ -1281,6 +1423,9 @@ class ModerationApi {
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1303,9 +1448,11 @@ class ModerationApi {
   ///
   /// * [String] value:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationUserSearchResponse?> getSearchUsers({ String? value, String? sso, }) async {
-    final response = await getSearchUsersWithHttpInfo( value: value, sso: sso, );
+  Future<ModerationUserSearchResponse?> getSearchUsers({ String? value, String? tenantId, String? sso, }) async {
+    final response = await getSearchUsersWithHttpInfo( value: value, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1324,8 +1471,10 @@ class ModerationApi {
   ///
   /// * [String] userId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getTrustFactorWithHttpInfo({ String? userId, String? sso, }) async {
+  Future<Response> getTrustFactorWithHttpInfo({ String? userId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-trust-factor';
 
@@ -1339,6 +1488,9 @@ class ModerationApi {
     if (userId != null) {
       queryParams.addAll(_queryParams('', 'userId', userId));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1361,9 +1513,11 @@ class ModerationApi {
   ///
   /// * [String] userId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetUserTrustFactorResponse?> getTrustFactor({ String? userId, String? sso, }) async {
-    final response = await getTrustFactorWithHttpInfo( userId: userId, sso: sso, );
+  Future<GetUserTrustFactorResponse?> getTrustFactor({ String? userId, String? tenantId, String? sso, }) async {
+    final response = await getTrustFactorWithHttpInfo( userId: userId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1380,8 +1534,10 @@ class ModerationApi {
   /// Performs an HTTP 'GET /auth/my-account/moderate-comments/user-ban-preference' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getUserBanPreferenceWithHttpInfo({ String? sso, }) async {
+  Future<Response> getUserBanPreferenceWithHttpInfo({ String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/user-ban-preference';
 
@@ -1392,6 +1548,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1412,9 +1571,11 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference({ String? sso, }) async {
-    final response = await getUserBanPreferenceWithHttpInfo( sso: sso, );
+  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference({ String? tenantId, String? sso, }) async {
+    final response = await getUserBanPreferenceWithHttpInfo( tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1433,8 +1594,10 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> getUserInternalProfileWithHttpInfo({ String? commentId, String? sso, }) async {
+  Future<Response> getUserInternalProfileWithHttpInfo({ String? commentId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-user-internal-profile';
 
@@ -1448,6 +1611,9 @@ class ModerationApi {
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1470,9 +1636,11 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<GetUserInternalProfileResponse?> getUserInternalProfile({ String? commentId, String? sso, }) async {
-    final response = await getUserInternalProfileWithHttpInfo( commentId: commentId, sso: sso, );
+  Future<GetUserInternalProfileResponse?> getUserInternalProfile({ String? commentId, String? tenantId, String? sso, }) async {
+    final response = await getUserInternalProfileWithHttpInfo( commentId: commentId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1493,8 +1661,12 @@ class ModerationApi {
   ///
   /// * [AdjustCommentVotesParams] adjustCommentVotesParams (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String? sso, }) async {
+  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/adjust-comment-votes/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1506,6 +1678,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1530,9 +1708,13 @@ class ModerationApi {
   ///
   /// * [AdjustCommentVotesParams] adjustCommentVotesParams (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String? sso, }) async {
-    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams,  sso: sso, );
+  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1559,8 +1741,10 @@ class ModerationApi {
   ///
   /// * [String] sorts:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postApiExportWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, String? sso, }) async {
+  Future<Response> postApiExportWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/export';
 
@@ -1586,6 +1770,9 @@ class ModerationApi {
     if (sorts != null) {
       queryParams.addAll(_queryParams('', 'sorts', sorts));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1616,9 +1803,11 @@ class ModerationApi {
   ///
   /// * [String] sorts:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationExportResponse?> postApiExport({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, String? sso, }) async {
-    final response = await postApiExportWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, sso: sso, );
+  Future<ModerationExportResponse?> postApiExport({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, String? tenantId, String? sso, }) async {
+    final response = await postApiExportWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1653,8 +1842,10 @@ class ModerationApi {
   ///
   /// * [String] banReason:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, { bool? banEmail, bool? banEmailDomain, bool? banIP, bool? deleteAllUsersComments, String? bannedUntil, bool? isShadowBan, String? updateId, String? banReason, String? sso, }) async {
+  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, { bool? banEmail, bool? banEmailDomain, bool? banIP, bool? deleteAllUsersComments, String? bannedUntil, bool? isShadowBan, String? updateId, String? banReason, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-user/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1690,6 +1881,9 @@ class ModerationApi {
     if (banReason != null) {
       queryParams.addAll(_queryParams('', 'banReason', banReason));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1728,9 +1922,11 @@ class ModerationApi {
   ///
   /// * [String] banReason:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, { bool? banEmail, bool? banEmailDomain, bool? banIP, bool? deleteAllUsersComments, String? bannedUntil, bool? isShadowBan, String? updateId, String? banReason, String? sso, }) async {
-    final response = await postBanUserFromCommentWithHttpInfo(commentId,  banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, sso: sso, );
+  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, { bool? banEmail, bool? banEmailDomain, bool? banIP, bool? deleteAllUsersComments, String? bannedUntil, bool? isShadowBan, String? updateId, String? banReason, String? tenantId, String? sso, }) async {
+    final response = await postBanUserFromCommentWithHttpInfo(commentId,  banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1749,8 +1945,10 @@ class ModerationApi {
   ///
   /// * [BanUserUndoParams] banUserUndoParams (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, { String? sso, }) async {
+  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-user/undo';
 
@@ -1761,6 +1959,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1783,9 +1984,11 @@ class ModerationApi {
   ///
   /// * [BanUserUndoParams] banUserUndoParams (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, { String? sso, }) async {
-    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams,  sso: sso, );
+  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, { String? tenantId, String? sso, }) async {
+    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1810,8 +2013,10 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? sso, }) async {
+  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/bulk-pre-ban-summary';
 
@@ -1831,6 +2036,9 @@ class ModerationApi {
     if (includeByEmailDomain != null) {
       queryParams.addAll(_queryParams('', 'includeByEmailDomain', includeByEmailDomain));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1859,9 +2067,11 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? sso, }) async {
-    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams,  includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, sso: sso, );
+  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
+    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams,  includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1880,8 +2090,10 @@ class ModerationApi {
   ///
   /// * [CommentsByIdsParams] commentsByIdsParams (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, { String? sso, }) async {
+  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comments-by-ids';
 
@@ -1892,6 +2104,9 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1914,9 +2129,11 @@ class ModerationApi {
   ///
   /// * [CommentsByIdsParams] commentsByIdsParams (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, { String? sso, }) async {
-    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams,  sso: sso, );
+  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, { String? tenantId, String? sso, }) async {
+    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1935,8 +2152,12 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postFlagCommentWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> postFlagCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1948,6 +2169,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1970,9 +2197,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postFlagComment(String commentId, { String? sso, }) async {
-    final response = await postFlagCommentWithHttpInfo(commentId,  sso: sso, );
+  Future<APIEmptyResponse?> postFlagComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postFlagCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1991,8 +2222,12 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postRemoveCommentWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> postRemoveCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/remove-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2004,6 +2239,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2026,9 +2267,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, { String? sso, }) async {
-    final response = await postRemoveCommentWithHttpInfo(commentId,  sso: sso, );
+  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postRemoveCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2047,8 +2292,12 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/restore-deleted-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2060,6 +2309,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2082,9 +2337,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, { String? sso, }) async {
-    final response = await postRestoreDeletedCommentWithHttpInfo(commentId,  sso: sso, );
+  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postRestoreDeletedCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2105,8 +2364,12 @@ class ModerationApi {
   ///
   /// * [bool] approved:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, { bool? approved, String? sso, }) async {
+  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, { bool? approved, String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-approval-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2121,6 +2384,12 @@ class ModerationApi {
     if (approved != null) {
       queryParams.addAll(_queryParams('', 'approved', approved));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2145,9 +2414,13 @@ class ModerationApi {
   ///
   /// * [bool] approved:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, { bool? approved, String? sso, }) async {
-    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId,  approved: approved, sso: sso, );
+  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, { bool? approved, String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId,  approved: approved, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2168,8 +2441,12 @@ class ModerationApi {
   ///
   /// * [bool] reviewed:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, { bool? reviewed, String? sso, }) async {
+  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, { bool? reviewed, String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-review-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2184,6 +2461,12 @@ class ModerationApi {
     if (reviewed != null) {
       queryParams.addAll(_queryParams('', 'reviewed', reviewed));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2208,9 +2491,13 @@ class ModerationApi {
   ///
   /// * [bool] reviewed:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, { bool? reviewed, String? sso, }) async {
-    final response = await postSetCommentReviewStatusWithHttpInfo(commentId,  reviewed: reviewed, sso: sso, );
+  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, { bool? reviewed, String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postSetCommentReviewStatusWithHttpInfo(commentId,  reviewed: reviewed, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2233,8 +2520,12 @@ class ModerationApi {
   ///
   /// * [bool] permNotSpam:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, { bool? spam, bool? permNotSpam, String? sso, }) async {
+  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, { bool? spam, bool? permNotSpam, String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-spam-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2252,6 +2543,12 @@ class ModerationApi {
     if (permNotSpam != null) {
       queryParams.addAll(_queryParams('', 'permNotSpam', permNotSpam));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2278,9 +2575,13 @@ class ModerationApi {
   ///
   /// * [bool] permNotSpam:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, { bool? spam, bool? permNotSpam, String? sso, }) async {
-    final response = await postSetCommentSpamStatusWithHttpInfo(commentId,  spam: spam, permNotSpam: permNotSpam, sso: sso, );
+  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, { bool? spam, bool? permNotSpam, String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postSetCommentSpamStatusWithHttpInfo(commentId,  spam: spam, permNotSpam: permNotSpam, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2301,8 +2602,12 @@ class ModerationApi {
   ///
   /// * [SetCommentTextParams] setCommentTextParams (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, { String? sso, }) async {
+  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2314,6 +2619,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2338,9 +2649,13 @@ class ModerationApi {
   ///
   /// * [SetCommentTextParams] setCommentTextParams (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String? sso, }) async {
-    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams,  sso: sso, );
+  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2359,8 +2674,12 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, { String? sso, }) async {
+  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/un-flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2372,6 +2691,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2394,9 +2719,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postUnFlagComment(String commentId, { String? sso, }) async {
-    final response = await postUnFlagCommentWithHttpInfo(commentId,  sso: sso, );
+  Future<APIEmptyResponse?> postUnFlagComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postUnFlagCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2417,8 +2746,12 @@ class ModerationApi {
   ///
   /// * [String] direction:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> postVoteWithHttpInfo(String commentId, { String? direction, String? sso, }) async {
+  Future<Response> postVoteWithHttpInfo(String commentId, { String? direction, String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/vote/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2433,6 +2766,12 @@ class ModerationApi {
     if (direction != null) {
       queryParams.addAll(_queryParams('', 'direction', direction));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2457,9 +2796,13 @@ class ModerationApi {
   ///
   /// * [String] direction:
   ///
+  /// * [String] broadcastId:
+  ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<VoteResponse?> postVote(String commentId, { String? direction, String? sso, }) async {
-    final response = await postVoteWithHttpInfo(commentId,  direction: direction, sso: sso, );
+  Future<VoteResponse?> postVote(String commentId, { String? direction, String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await postVoteWithHttpInfo(commentId,  direction: direction, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2484,8 +2827,10 @@ class ModerationApi {
   ///
   /// * [String] broadcastId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, { String? userId, String? commentId, String? broadcastId, String? sso, }) async {
+  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/award-badge';
 
@@ -2506,6 +2851,9 @@ class ModerationApi {
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2534,9 +2882,11 @@ class ModerationApi {
   ///
   /// * [String] broadcastId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, { String? userId, String? commentId, String? broadcastId, String? sso, }) async {
-    final response = await putAwardBadgeWithHttpInfo(badgeId,  userId: userId, commentId: commentId, broadcastId: broadcastId, sso: sso, );
+  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await putAwardBadgeWithHttpInfo(badgeId,  userId: userId, commentId: commentId, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2555,8 +2905,10 @@ class ModerationApi {
   ///
   /// * [String] urlId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> putCloseThreadWithHttpInfo(String urlId, { String? sso, }) async {
+  Future<Response> putCloseThreadWithHttpInfo(String urlId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/close-thread';
 
@@ -2568,6 +2920,9 @@ class ModerationApi {
     final formParams = <String, String>{};
 
       queryParams.addAll(_queryParams('', 'urlId', urlId));
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2590,9 +2945,11 @@ class ModerationApi {
   ///
   /// * [String] urlId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putCloseThread(String urlId, { String? sso, }) async {
-    final response = await putCloseThreadWithHttpInfo(urlId,  sso: sso, );
+  Future<APIEmptyResponse?> putCloseThread(String urlId, { String? tenantId, String? sso, }) async {
+    final response = await putCloseThreadWithHttpInfo(urlId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2617,8 +2974,10 @@ class ModerationApi {
   ///
   /// * [String] broadcastId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, { String? userId, String? commentId, String? broadcastId, String? sso, }) async {
+  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/remove-badge';
 
@@ -2639,6 +2998,9 @@ class ModerationApi {
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2667,9 +3029,11 @@ class ModerationApi {
   ///
   /// * [String] broadcastId:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, { String? userId, String? commentId, String? broadcastId, String? sso, }) async {
-    final response = await putRemoveBadgeWithHttpInfo(badgeId,  userId: userId, commentId: commentId, broadcastId: broadcastId, sso: sso, );
+  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
+    final response = await putRemoveBadgeWithHttpInfo(badgeId,  userId: userId, commentId: commentId, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2688,8 +3052,10 @@ class ModerationApi {
   ///
   /// * [String] urlId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> putReopenThreadWithHttpInfo(String urlId, { String? sso, }) async {
+  Future<Response> putReopenThreadWithHttpInfo(String urlId, { String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/reopen-thread';
 
@@ -2701,6 +3067,9 @@ class ModerationApi {
     final formParams = <String, String>{};
 
       queryParams.addAll(_queryParams('', 'urlId', urlId));
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2723,9 +3092,11 @@ class ModerationApi {
   ///
   /// * [String] urlId (required):
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putReopenThread(String urlId, { String? sso, }) async {
-    final response = await putReopenThreadWithHttpInfo(urlId,  sso: sso, );
+  Future<APIEmptyResponse?> putReopenThread(String urlId, { String? tenantId, String? sso, }) async {
+    final response = await putReopenThreadWithHttpInfo(urlId,  tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2746,8 +3117,10 @@ class ModerationApi {
   ///
   /// * [String] trustFactor:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<Response> setTrustFactorWithHttpInfo({ String? userId, String? trustFactor, String? sso, }) async {
+  Future<Response> setTrustFactorWithHttpInfo({ String? userId, String? trustFactor, String? tenantId, String? sso, }) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-trust-factor';
 
@@ -2764,6 +3137,9 @@ class ModerationApi {
     if (trustFactor != null) {
       queryParams.addAll(_queryParams('', 'trustFactor', trustFactor));
     }
+    if (tenantId != null) {
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2788,9 +3164,11 @@ class ModerationApi {
   ///
   /// * [String] trustFactor:
   ///
+  /// * [String] tenantId:
+  ///
   /// * [String] sso:
-  Future<SetUserTrustFactorResponse?> setTrustFactor({ String? userId, String? trustFactor, String? sso, }) async {
-    final response = await setTrustFactorWithHttpInfo( userId: userId, trustFactor: trustFactor, sso: sso, );
+  Future<SetUserTrustFactorResponse?> setTrustFactor({ String? userId, String? trustFactor, String? tenantId, String? sso, }) async {
+    final response = await setTrustFactorWithHttpInfo( userId: userId, trustFactor: trustFactor, tenantId: tenantId, sso: sso, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
diff --git a/client/pubspec.yaml b/client/pubspec.yaml
index 05db75b..4692ae3 100644
--- a/client/pubspec.yaml
+++ b/client/pubspec.yaml
@@ -3,7 +3,7 @@
 #
 
 name: 'fastcomments_dart'
-version: '2.0.1'
+version: '2.1.0'
 description: 'Official Dart client for the FastComments REST API.'
 homepage: 'https://fastcomments.com'
 repository: https://github.com/fastcomments/fastcomments-dart
diff --git a/client/test/moderation_api_test.dart b/client/test/moderation_api_test.dart
index 5eb7548..3af5ea1 100644
--- a/client/test/moderation_api_test.dart
+++ b/client/test/moderation_api_test.dart
@@ -17,217 +17,217 @@ void main() {
   // final instance = ModerationApi();
 
   group('tests for ModerationApi', () {
-    //Future<VoteDeleteResponse> deleteModerationVote(String commentId, String voteId, { String sso }) async
+    //Future<VoteDeleteResponse> deleteModerationVote(String commentId, String voteId, { String broadcastId, String tenantId, String sso }) async
     test('test deleteModerationVote', () async {
       // TODO
     });
 
-    //Future<ModerationAPIGetCommentsResponse> getApiComments({ double page, double count, String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, bool demo, String sso }) async
+    //Future<ModerationAPIGetCommentsResponse> getApiComments({ double page, double count, String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, bool demo, String tenantId, String sso }) async
     test('test getApiComments', () async {
       // TODO
     });
 
-    //Future<ModerationExportStatusResponse> getApiExportStatus({ String batchJobId, String sso }) async
+    //Future<ModerationExportStatusResponse> getApiExportStatus({ String batchJobId, String tenantId, String sso }) async
     test('test getApiExportStatus', () async {
       // TODO
     });
 
-    //Future<ModerationAPIGetCommentIdsResponse> getApiIds({ String textSearch, String byIPFromComment, String filters, String searchFilters, String afterId, bool demo, String sso }) async
+    //Future<ModerationAPIGetCommentIdsResponse> getApiIds({ String textSearch, String byIPFromComment, String filters, String searchFilters, String afterId, bool demo, String tenantId, String sso }) async
     test('test getApiIds', () async {
       // TODO
     });
 
-    //Future<GetBannedUsersFromCommentResponse> getBanUsersFromComment(String commentId, { String sso }) async
+    //Future<GetBannedUsersFromCommentResponse> getBanUsersFromComment(String commentId, { String tenantId, String sso }) async
     test('test getBanUsersFromComment', () async {
       // TODO
     });
 
-    //Future<GetCommentBanStatusResponse> getCommentBanStatus(String commentId, { String sso }) async
+    //Future<GetCommentBanStatusResponse> getCommentBanStatus(String commentId, { String tenantId, String sso }) async
     test('test getCommentBanStatus', () async {
       // TODO
     });
 
-    //Future<ModerationAPIChildCommentsResponse> getCommentChildren(String commentId, { String sso }) async
+    //Future<ModerationAPIChildCommentsResponse> getCommentChildren(String commentId, { String tenantId, String sso }) async
     test('test getCommentChildren', () async {
       // TODO
     });
 
-    //Future<ModerationAPICountCommentsResponse> getCount({ String textSearch, String byIPFromComment, String filter, String searchFilters, bool demo, String sso }) async
+    //Future<ModerationAPICountCommentsResponse> getCount({ String textSearch, String byIPFromComment, String filter, String searchFilters, bool demo, String tenantId, String sso }) async
     test('test getCount', () async {
       // TODO
     });
 
-    //Future<GetBannedUsersCountResponse> getCounts({ String sso }) async
+    //Future<GetBannedUsersCountResponse> getCounts({ String tenantId, String sso }) async
     test('test getCounts', () async {
       // TODO
     });
 
-    //Future<ModerationAPIGetLogsResponse> getLogs(String commentId, { String sso }) async
+    //Future<ModerationAPIGetLogsResponse> getLogs(String commentId, { String tenantId, String sso }) async
     test('test getLogs', () async {
       // TODO
     });
 
-    //Future<GetTenantManualBadgesResponse> getManualBadges({ String sso }) async
+    //Future<GetTenantManualBadgesResponse> getManualBadges({ String tenantId, String sso }) async
     test('test getManualBadges', () async {
       // TODO
     });
 
-    //Future<GetUserManualBadgesResponse> getManualBadgesForUser({ String badgesUserId, String commentId, String sso }) async
+    //Future<GetUserManualBadgesResponse> getManualBadgesForUser({ String badgesUserId, String commentId, String tenantId, String sso }) async
     test('test getManualBadgesForUser', () async {
       // TODO
     });
 
-    //Future<ModerationAPICommentResponse> getModerationComment(String commentId, { bool includeEmail, bool includeIP, String sso }) async
+    //Future<ModerationAPICommentResponse> getModerationComment(String commentId, { bool includeEmail, bool includeIP, String tenantId, String sso }) async
     test('test getModerationComment', () async {
       // TODO
     });
 
-    //Future<GetCommentTextResponse> getModerationCommentText(String commentId, { String sso }) async
+    //Future<GetCommentTextResponse> getModerationCommentText(String commentId, { String tenantId, String sso }) async
     test('test getModerationCommentText', () async {
       // TODO
     });
 
-    //Future<PreBanSummary> getPreBanSummary(String commentId, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String sso }) async
+    //Future<PreBanSummary> getPreBanSummary(String commentId, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String tenantId, String sso }) async
     test('test getPreBanSummary', () async {
       // TODO
     });
 
-    //Future<ModerationCommentSearchResponse> getSearchCommentsSummary({ String value, String filters, String searchFilters, String sso }) async
+    //Future<ModerationCommentSearchResponse> getSearchCommentsSummary({ String value, String filters, String searchFilters, String tenantId, String sso }) async
     test('test getSearchCommentsSummary', () async {
       // TODO
     });
 
-    //Future<ModerationPageSearchResponse> getSearchPages({ String value, String sso }) async
+    //Future<ModerationPageSearchResponse> getSearchPages({ String value, String tenantId, String sso }) async
     test('test getSearchPages', () async {
       // TODO
     });
 
-    //Future<ModerationSiteSearchResponse> getSearchSites({ String value, String sso }) async
+    //Future<ModerationSiteSearchResponse> getSearchSites({ String value, String tenantId, String sso }) async
     test('test getSearchSites', () async {
       // TODO
     });
 
-    //Future<ModerationSuggestResponse> getSearchSuggest({ String textSearch, String sso }) async
+    //Future<ModerationSuggestResponse> getSearchSuggest({ String textSearch, String tenantId, String sso }) async
     test('test getSearchSuggest', () async {
       // TODO
     });
 
-    //Future<ModerationUserSearchResponse> getSearchUsers({ String value, String sso }) async
+    //Future<ModerationUserSearchResponse> getSearchUsers({ String value, String tenantId, String sso }) async
     test('test getSearchUsers', () async {
       // TODO
     });
 
-    //Future<GetUserTrustFactorResponse> getTrustFactor({ String userId, String sso }) async
+    //Future<GetUserTrustFactorResponse> getTrustFactor({ String userId, String tenantId, String sso }) async
     test('test getTrustFactor', () async {
       // TODO
     });
 
-    //Future<APIModerateGetUserBanPreferencesResponse> getUserBanPreference({ String sso }) async
+    //Future<APIModerateGetUserBanPreferencesResponse> getUserBanPreference({ String tenantId, String sso }) async
     test('test getUserBanPreference', () async {
       // TODO
     });
 
-    //Future<GetUserInternalProfileResponse> getUserInternalProfile({ String commentId, String sso }) async
+    //Future<GetUserInternalProfileResponse> getUserInternalProfile({ String commentId, String tenantId, String sso }) async
     test('test getUserInternalProfile', () async {
       // TODO
     });
 
-    //Future<AdjustVotesResponse> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String sso }) async
+    //Future<AdjustVotesResponse> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String broadcastId, String tenantId, String sso }) async
     test('test postAdjustCommentVotes', () async {
       // TODO
     });
 
-    //Future<ModerationExportResponse> postApiExport({ String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, String sso }) async
+    //Future<ModerationExportResponse> postApiExport({ String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, String tenantId, String sso }) async
     test('test postApiExport', () async {
       // TODO
     });
 
-    //Future<BanUserFromCommentResult> postBanUserFromComment(String commentId, { bool banEmail, bool banEmailDomain, bool banIP, bool deleteAllUsersComments, String bannedUntil, bool isShadowBan, String updateId, String banReason, String sso }) async
+    //Future<BanUserFromCommentResult> postBanUserFromComment(String commentId, { bool banEmail, bool banEmailDomain, bool banIP, bool deleteAllUsersComments, String bannedUntil, bool isShadowBan, String updateId, String banReason, String tenantId, String sso }) async
     test('test postBanUserFromComment', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postBanUserUndo(BanUserUndoParams banUserUndoParams, { String sso }) async
+    //Future<APIEmptyResponse> postBanUserUndo(BanUserUndoParams banUserUndoParams, { String tenantId, String sso }) async
     test('test postBanUserUndo', () async {
       // TODO
     });
 
-    //Future<BulkPreBanSummary> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String sso }) async
+    //Future<BulkPreBanSummary> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String tenantId, String sso }) async
     test('test postBulkPreBanSummary', () async {
       // TODO
     });
 
-    //Future<ModerationAPIChildCommentsResponse> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, { String sso }) async
+    //Future<ModerationAPIChildCommentsResponse> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, { String tenantId, String sso }) async
     test('test postCommentsByIds', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postFlagComment(String commentId, { String sso }) async
+    //Future<APIEmptyResponse> postFlagComment(String commentId, { String broadcastId, String tenantId, String sso }) async
     test('test postFlagComment', () async {
       // TODO
     });
 
-    //Future<PostRemoveCommentResponse> postRemoveComment(String commentId, { String sso }) async
+    //Future<PostRemoveCommentResponse> postRemoveComment(String commentId, { String broadcastId, String tenantId, String sso }) async
     test('test postRemoveComment', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postRestoreDeletedComment(String commentId, { String sso }) async
+    //Future<APIEmptyResponse> postRestoreDeletedComment(String commentId, { String broadcastId, String tenantId, String sso }) async
     test('test postRestoreDeletedComment', () async {
       // TODO
     });
 
-    //Future<SetCommentApprovedResponse> postSetCommentApprovalStatus(String commentId, { bool approved, String sso }) async
+    //Future<SetCommentApprovedResponse> postSetCommentApprovalStatus(String commentId, { bool approved, String broadcastId, String tenantId, String sso }) async
     test('test postSetCommentApprovalStatus', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postSetCommentReviewStatus(String commentId, { bool reviewed, String sso }) async
+    //Future<APIEmptyResponse> postSetCommentReviewStatus(String commentId, { bool reviewed, String broadcastId, String tenantId, String sso }) async
     test('test postSetCommentReviewStatus', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postSetCommentSpamStatus(String commentId, { bool spam, bool permNotSpam, String sso }) async
+    //Future<APIEmptyResponse> postSetCommentSpamStatus(String commentId, { bool spam, bool permNotSpam, String broadcastId, String tenantId, String sso }) async
     test('test postSetCommentSpamStatus', () async {
       // TODO
     });
 
-    //Future<SetCommentTextResponse> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String sso }) async
+    //Future<SetCommentTextResponse> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String broadcastId, String tenantId, String sso }) async
     test('test postSetCommentText', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postUnFlagComment(String commentId, { String sso }) async
+    //Future<APIEmptyResponse> postUnFlagComment(String commentId, { String broadcastId, String tenantId, String sso }) async
     test('test postUnFlagComment', () async {
       // TODO
     });
 
-    //Future<VoteResponse> postVote(String commentId, { String direction, String sso }) async
+    //Future<VoteResponse> postVote(String commentId, { String direction, String broadcastId, String tenantId, String sso }) async
     test('test postVote', () async {
       // TODO
     });
 
-    //Future<AwardUserBadgeResponse> putAwardBadge(String badgeId, { String userId, String commentId, String broadcastId, String sso }) async
+    //Future<AwardUserBadgeResponse> putAwardBadge(String badgeId, { String userId, String commentId, String broadcastId, String tenantId, String sso }) async
     test('test putAwardBadge', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> putCloseThread(String urlId, { String sso }) async
+    //Future<APIEmptyResponse> putCloseThread(String urlId, { String tenantId, String sso }) async
     test('test putCloseThread', () async {
       // TODO
     });
 
-    //Future<RemoveUserBadgeResponse> putRemoveBadge(String badgeId, { String userId, String commentId, String broadcastId, String sso }) async
+    //Future<RemoveUserBadgeResponse> putRemoveBadge(String badgeId, { String userId, String commentId, String broadcastId, String tenantId, String sso }) async
     test('test putRemoveBadge', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> putReopenThread(String urlId, { String sso }) async
+    //Future<APIEmptyResponse> putReopenThread(String urlId, { String tenantId, String sso }) async
     test('test putReopenThread', () async {
       // TODO
     });
 
-    //Future<SetUserTrustFactorResponse> setTrustFactor({ String userId, String trustFactor, String sso }) async
+    //Future<SetUserTrustFactorResponse> setTrustFactor({ String userId, String trustFactor, String tenantId, String sso }) async
     test('test setTrustFactor', () async {
       // TODO
     });
diff --git a/config.json b/config.json
index fc2ff8f..30d10ef 100644
--- a/config.json
+++ b/config.json
@@ -2,7 +2,7 @@
   "pubName": "fastcomments_dart",
   "pubAuthor": "FastComments",
   "pubAuthorEmail": "support@fastcomments.com",
-  "pubVersion": "2.0.1",
+  "pubVersion": "2.1.0",
   "pubDescription": "Official Dart client for the FastComments REST API.",
   "pubHomepage": "https://fastcomments.com",
   "pubRepository": "https://github.com/fastcomments/fastcomments-dart",
diff --git a/openapi.json b/openapi.json
index ca0225c..0f72c9c 100644
--- a/openapi.json
+++ b/openapi.json
@@ -13177,6 +13177,14 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13266,6 +13274,14 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13373,6 +13389,14 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13454,6 +13478,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13503,6 +13535,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13552,6 +13592,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13601,6 +13649,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13650,6 +13706,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13715,6 +13779,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13764,6 +13836,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13837,6 +13917,14 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13902,6 +13990,14 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14025,6 +14121,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14074,6 +14178,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14115,6 +14227,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14182,6 +14302,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14231,6 +14367,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14280,6 +14432,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14329,6 +14497,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14386,6 +14570,22 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14451,6 +14651,22 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14508,6 +14724,22 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14557,6 +14789,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14622,6 +14862,14 @@
 							"type": "boolean"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14663,6 +14911,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14722,6 +14978,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14771,6 +15035,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14820,6 +15092,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14879,6 +15167,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14946,6 +15250,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15003,6 +15323,22 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "broadcastId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15052,6 +15388,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15093,6 +15437,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15134,6 +15486,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15191,6 +15551,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15264,6 +15632,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15337,6 +15713,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15386,6 +15770,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15443,6 +15835,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15492,6 +15892,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15541,6 +15949,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15590,6 +16006,14 @@
 							"type": "string"
 						}
 					},
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -15631,6 +16055,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": false,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "sso",

From 717b52e5d78ec70f1d2a0d9430334d7e64aad5b1 Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Mon, 22 Jun 2026 19:39:16 -0700
Subject: [PATCH 2/9] Regenerate with grouped request objects
 (useSingleRequestParameter)

API methods now take a single Api<Op>Request object. Updated SSO integration test and README examples.
---
 README.md                                |   16 +-
 client/doc/ModerationApi.md              |  104 +-
 client/lib/api/default_api.dart          | 2496 +++++++++++++++++++---
 client/lib/api/moderation_api.dart       | 1271 +++++++++--
 client/lib/api/public_api.dart           | 1367 ++++++++++--
 client/test/moderation_api_test.dart     |   26 +-
 config.json                              |    3 +-
 openapi.json                             |   52 +-
 sso_tests/test/sso_integration_test.dart |   15 +-
 9 files changed, 4531 insertions(+), 819 deletions(-)

diff --git a/README.md b/README.md
index a48b576..085c994 100644
--- a/README.md
+++ b/README.md
@@ -56,25 +56,29 @@ The client exposes three API classes:
 ```dart
 import 'package:fastcomments_dart/api.dart';
 
-final api = DefaultApi(ApiClient(basePath: 'https://fastcomments.com'));
-final comments = await api.getCommentsPublic(
-  'YOUR_TENANT_ID',
+final api = PublicApi(ApiClient(basePath: 'https://fastcomments.com'));
+final comments = await api.getCommentsPublic(ApiGetCommentsPublicRequest(
+  tenantId: 'YOUR_TENANT_ID',
   urlId: 'YOUR_URL_ID',
-);
+));
 ```
 
 ```dart
 import 'package:fastcomments_dart/api.dart';
 
 final publicApi = PublicApi(ApiClient(basePath: 'https://fastcomments.com'));
-final feedPosts = await publicApi.getFeedPostsPublic('YOUR_TENANT_ID');
+final feedPosts = await publicApi.getFeedPostsPublic(
+  ApiGetFeedPostsPublicRequest(tenantId: 'YOUR_TENANT_ID'),
+);
 ```
 
 ```dart
 import 'package:fastcomments_dart/api.dart';
 
 final moderation = ModerationApi(ApiClient(basePath: 'https://fastcomments.com'));
-final result = await moderation.getApiComments(sso: 'SSO_TOKEN');
+final result = await moderation.getApiComments(
+  ApiGetApiCommentsRequest(sso: 'SSO_TOKEN'),
+);
 ```
 
 ## SSO
diff --git a/client/doc/ModerationApi.md b/client/doc/ModerationApi.md
index b9e807d..8112bdd 100644
--- a/client/doc/ModerationApi.md
+++ b/client/doc/ModerationApi.md
@@ -55,7 +55,7 @@ Method | HTTP request | Description
 
 
 # **deleteModerationVote**
-> VoteDeleteResponse deleteModerationVote(commentId, voteId, broadcastId, tenantId, sso)
+> VoteDeleteResponse deleteModerationVote(commentId, voteId, tenantId, broadcastId, sso)
 
 
 
@@ -66,12 +66,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final voteId = voteId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteModerationVote(commentId, voteId, broadcastId, tenantId, sso);
+    final result = api_instance.deleteModerationVote(commentId, voteId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->deleteModerationVote: $e\n');
@@ -84,8 +84,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **voteId** | **String**|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1136,7 +1136,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postAdjustCommentVotes**
-> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, broadcastId, tenantId, sso)
+> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, tenantId, broadcastId, sso)
 
 
 
@@ -1147,12 +1147,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final adjustCommentVotesParams = AdjustCommentVotesParams(); // AdjustCommentVotesParams | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, broadcastId, tenantId, sso);
+    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postAdjustCommentVotes: $e\n');
@@ -1165,8 +1165,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **adjustCommentVotesParams** | [**AdjustCommentVotesParams**](AdjustCommentVotesParams.md)|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1440,7 +1440,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postFlagComment**
-> APIEmptyResponse postFlagComment(commentId, broadcastId, tenantId, sso)
+> APIEmptyResponse postFlagComment(commentId, tenantId, broadcastId, sso)
 
 
 
@@ -1450,12 +1450,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postFlagComment(commentId, broadcastId, tenantId, sso);
+    final result = api_instance.postFlagComment(commentId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postFlagComment: $e\n');
@@ -1467,8 +1467,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1487,7 +1487,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRemoveComment**
-> PostRemoveCommentResponse postRemoveComment(commentId, broadcastId, tenantId, sso)
+> PostRemoveCommentResponse postRemoveComment(commentId, tenantId, broadcastId, sso)
 
 
 
@@ -1497,12 +1497,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRemoveComment(commentId, broadcastId, tenantId, sso);
+    final result = api_instance.postRemoveComment(commentId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRemoveComment: $e\n');
@@ -1514,8 +1514,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1534,7 +1534,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRestoreDeletedComment**
-> APIEmptyResponse postRestoreDeletedComment(commentId, broadcastId, tenantId, sso)
+> APIEmptyResponse postRestoreDeletedComment(commentId, tenantId, broadcastId, sso)
 
 
 
@@ -1544,12 +1544,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRestoreDeletedComment(commentId, broadcastId, tenantId, sso);
+    final result = api_instance.postRestoreDeletedComment(commentId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRestoreDeletedComment: $e\n');
@@ -1561,8 +1561,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1581,7 +1581,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentApprovalStatus**
-> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, approved, broadcastId, tenantId, sso)
+> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, approved, tenantId, broadcastId, sso)
 
 
 
@@ -1592,12 +1592,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final approved = true; // bool | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentApprovalStatus(commentId, approved, broadcastId, tenantId, sso);
+    final result = api_instance.postSetCommentApprovalStatus(commentId, approved, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentApprovalStatus: $e\n');
@@ -1610,8 +1610,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **approved** | **bool**|  | [optional] 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1630,7 +1630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentReviewStatus**
-> APIEmptyResponse postSetCommentReviewStatus(commentId, reviewed, broadcastId, tenantId, sso)
+> APIEmptyResponse postSetCommentReviewStatus(commentId, reviewed, tenantId, broadcastId, sso)
 
 
 
@@ -1641,12 +1641,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final reviewed = true; // bool | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentReviewStatus(commentId, reviewed, broadcastId, tenantId, sso);
+    final result = api_instance.postSetCommentReviewStatus(commentId, reviewed, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentReviewStatus: $e\n');
@@ -1659,8 +1659,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **reviewed** | **bool**|  | [optional] 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1679,7 +1679,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentSpamStatus**
-> APIEmptyResponse postSetCommentSpamStatus(commentId, spam, permNotSpam, broadcastId, tenantId, sso)
+> APIEmptyResponse postSetCommentSpamStatus(commentId, spam, permNotSpam, tenantId, broadcastId, sso)
 
 
 
@@ -1691,12 +1691,12 @@ final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final spam = true; // bool | 
 final permNotSpam = true; // bool | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentSpamStatus(commentId, spam, permNotSpam, broadcastId, tenantId, sso);
+    final result = api_instance.postSetCommentSpamStatus(commentId, spam, permNotSpam, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentSpamStatus: $e\n');
@@ -1710,8 +1710,8 @@ Name | Type | Description  | Notes
  **commentId** | **String**|  | 
  **spam** | **bool**|  | [optional] 
  **permNotSpam** | **bool**|  | [optional] 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1730,7 +1730,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentText**
-> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, broadcastId, tenantId, sso)
+> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, tenantId, broadcastId, sso)
 
 
 
@@ -1741,12 +1741,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final setCommentTextParams = SetCommentTextParams(); // SetCommentTextParams | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, broadcastId, tenantId, sso);
+    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentText: $e\n');
@@ -1759,8 +1759,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **setCommentTextParams** | [**SetCommentTextParams**](SetCommentTextParams.md)|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1779,7 +1779,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postUnFlagComment**
-> APIEmptyResponse postUnFlagComment(commentId, broadcastId, tenantId, sso)
+> APIEmptyResponse postUnFlagComment(commentId, tenantId, broadcastId, sso)
 
 
 
@@ -1789,12 +1789,12 @@ import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postUnFlagComment(commentId, broadcastId, tenantId, sso);
+    final result = api_instance.postUnFlagComment(commentId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postUnFlagComment: $e\n');
@@ -1806,8 +1806,8 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1826,7 +1826,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postVote**
-> VoteResponse postVote(commentId, direction, broadcastId, tenantId, sso)
+> VoteResponse postVote(commentId, direction, tenantId, broadcastId, sso)
 
 
 
@@ -1837,12 +1837,12 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = ModerationApi();
 final commentId = commentId_example; // String | 
 final direction = direction_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postVote(commentId, direction, broadcastId, tenantId, sso);
+    final result = api_instance.postVote(commentId, direction, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postVote: $e\n');
@@ -1855,8 +1855,8 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **commentId** | **String**|  | 
  **direction** | **String**|  | [optional] 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1875,7 +1875,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putAwardBadge**
-> AwardUserBadgeResponse putAwardBadge(badgeId, userId, commentId, broadcastId, tenantId, sso)
+> AwardUserBadgeResponse putAwardBadge(badgeId, userId, commentId, tenantId, broadcastId, sso)
 
 
 
@@ -1887,12 +1887,12 @@ final api_instance = ModerationApi();
 final badgeId = badgeId_example; // String | 
 final userId = userId_example; // String | 
 final commentId = commentId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putAwardBadge(badgeId, userId, commentId, broadcastId, tenantId, sso);
+    final result = api_instance.putAwardBadge(badgeId, userId, commentId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putAwardBadge: $e\n');
@@ -1906,8 +1906,8 @@ Name | Type | Description  | Notes
  **badgeId** | **String**|  | 
  **userId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1971,7 +1971,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putRemoveBadge**
-> RemoveUserBadgeResponse putRemoveBadge(badgeId, userId, commentId, broadcastId, tenantId, sso)
+> RemoveUserBadgeResponse putRemoveBadge(badgeId, userId, commentId, tenantId, broadcastId, sso)
 
 
 
@@ -1983,12 +1983,12 @@ final api_instance = ModerationApi();
 final badgeId = badgeId_example; // String | 
 final userId = userId_example; // String | 
 final commentId = commentId_example; // String | 
-final broadcastId = broadcastId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putRemoveBadge(badgeId, userId, commentId, broadcastId, tenantId, sso);
+    final result = api_instance.putRemoveBadge(badgeId, userId, commentId, tenantId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putRemoveBadge: $e\n');
@@ -2002,8 +2002,8 @@ Name | Type | Description  | Notes
  **badgeId** | **String**|  | 
  **userId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
- **broadcastId** | **String**|  | [optional] 
  **tenantId** | **String**|  | [optional] 
+ **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
diff --git a/client/lib/api/default_api.dart b/client/lib/api/default_api.dart
index c101e96..a917687 100644
--- a/client/lib/api/default_api.dart
+++ b/client/lib/api/default_api.dart
@@ -22,7 +22,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [AddDomainConfigParams] addDomainConfigParams (required):
-  Future<Response> addDomainConfigWithHttpInfo(String tenantId, AddDomainConfigParams addDomainConfigParams,) async {
+  Future<Response> addDomainConfigWithHttpInfo(ApiAddDomainConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final addDomainConfigParams = request.addDomainConfigParams;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs';
 
@@ -54,8 +56,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [AddDomainConfigParams] addDomainConfigParams (required):
-  Future<AddDomainConfigResponse?> addDomainConfig(String tenantId, AddDomainConfigParams addDomainConfigParams,) async {
-    final response = await addDomainConfigWithHttpInfo(tenantId, addDomainConfigParams,);
+  Future<AddDomainConfigResponse?> addDomainConfig(ApiAddDomainConfigRequest request,) async {
+    final response = await addDomainConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -75,7 +77,9 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<Response> addHashTagWithHttpInfo({ String? tenantId, CreateHashTagBody? createHashTagBody, }) async {
+  Future<Response> addHashTagWithHttpInfo(ApiAddHashTagRequest request,) async {
+    final tenantId = request.tenantId;
+    final createHashTagBody = request.createHashTagBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -109,8 +113,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<CreateHashTagResponse?> addHashTag({ String? tenantId, CreateHashTagBody? createHashTagBody, }) async {
-    final response = await addHashTagWithHttpInfo( tenantId: tenantId, createHashTagBody: createHashTagBody, );
+  Future<CreateHashTagResponse?> addHashTag(ApiAddHashTagRequest request,) async {
+    final response = await addHashTagWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -130,7 +134,9 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<Response> addHashTagsBulkWithHttpInfo({ String? tenantId, BulkCreateHashTagsBody? bulkCreateHashTagsBody, }) async {
+  Future<Response> addHashTagsBulkWithHttpInfo(ApiAddHashTagsBulkRequest request,) async {
+    final tenantId = request.tenantId;
+    final bulkCreateHashTagsBody = request.bulkCreateHashTagsBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/bulk';
 
@@ -164,8 +170,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<BulkCreateHashTagsResponse?> addHashTagsBulk({ String? tenantId, BulkCreateHashTagsBody? bulkCreateHashTagsBody, }) async {
-    final response = await addHashTagsBulkWithHttpInfo( tenantId: tenantId, bulkCreateHashTagsBody: bulkCreateHashTagsBody, );
+  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(ApiAddHashTagsBulkRequest request,) async {
+    final response = await addHashTagsBulkWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -185,7 +191,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIPageData] createAPIPageData (required):
-  Future<Response> addPageWithHttpInfo(String tenantId, CreateAPIPageData createAPIPageData,) async {
+  Future<Response> addPageWithHttpInfo(ApiAddPageRequest request,) async {
+    final tenantId = request.tenantId;
+    final createAPIPageData = request.createAPIPageData;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages';
 
@@ -217,8 +225,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIPageData] createAPIPageData (required):
-  Future<AddPageAPIResponse?> addPage(String tenantId, CreateAPIPageData createAPIPageData,) async {
-    final response = await addPageWithHttpInfo(tenantId, createAPIPageData,);
+  Future<AddPageAPIResponse?> addPage(ApiAddPageRequest request,) async {
+    final response = await addPageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -238,7 +246,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPISSOUserData] createAPISSOUserData (required):
-  Future<Response> addSSOUserWithHttpInfo(String tenantId, CreateAPISSOUserData createAPISSOUserData,) async {
+  Future<Response> addSSOUserWithHttpInfo(ApiAddSSOUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final createAPISSOUserData = request.createAPISSOUserData;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -270,8 +280,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPISSOUserData] createAPISSOUserData (required):
-  Future<AddSSOUserAPIResponse?> addSSOUser(String tenantId, CreateAPISSOUserData createAPISSOUserData,) async {
-    final response = await addSSOUserWithHttpInfo(tenantId, createAPISSOUserData,);
+  Future<AddSSOUserAPIResponse?> addSSOUser(ApiAddSSOUserRequest request,) async {
+    final response = await addSSOUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -298,7 +308,11 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<Response> aggregateWithHttpInfo(String tenantId, AggregationRequest aggregationRequest, { String? parentTenantId, bool? includeStats, }) async {
+  Future<Response> aggregateWithHttpInfo(ApiAggregateRequest request,) async {
+    final tenantId = request.tenantId;
+    final aggregationRequest = request.aggregationRequest;
+    final parentTenantId = request.parentTenantId;
+    final includeStats = request.includeStats;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/aggregate';
 
@@ -342,8 +356,8 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<AggregateResponse?> aggregate(String tenantId, AggregationRequest aggregationRequest, { String? parentTenantId, bool? includeStats, }) async {
-    final response = await aggregateWithHttpInfo(tenantId, aggregationRequest,  parentTenantId: parentTenantId, includeStats: includeStats, );
+  Future<AggregateResponse?> aggregate(ApiAggregateRequest request,) async {
+    final response = await aggregateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -373,7 +387,14 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> aggregateQuestionResultsWithHttpInfo(String tenantId, { String? questionId, List<String>? questionIds, String? urlId, AggregateTimeBucket? timeBucket, DateTime? startDate, bool? forceRecalculate, }) async {
+  Future<Response> aggregateQuestionResultsWithHttpInfo(ApiAggregateQuestionResultsRequest request,) async {
+    final tenantId = request.tenantId;
+    final questionId = request.questionId;
+    final questionIds = request.questionIds;
+    final urlId = request.urlId;
+    final timeBucket = request.timeBucket;
+    final startDate = request.startDate;
+    final forceRecalculate = request.forceRecalculate;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation';
 
@@ -433,8 +454,8 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(String tenantId, { String? questionId, List<String>? questionIds, String? urlId, AggregateTimeBucket? timeBucket, DateTime? startDate, bool? forceRecalculate, }) async {
-    final response = await aggregateQuestionResultsWithHttpInfo(tenantId,  questionId: questionId, questionIds: questionIds, urlId: urlId, timeBucket: timeBucket, startDate: startDate, forceRecalculate: forceRecalculate, );
+  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(ApiAggregateQuestionResultsRequest request,) async {
+    final response = await aggregateQuestionResultsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -460,7 +481,12 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> blockUserFromCommentWithHttpInfo(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, { String? userId, String? anonUserId, }) async {
+  Future<Response> blockUserFromCommentWithHttpInfo(ApiBlockUserFromCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final blockFromCommentParams = request.blockFromCommentParams;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/block'
       .replaceAll('{id}', id);
@@ -505,8 +531,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<BlockSuccess?> blockUserFromComment(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, { String? userId, String? anonUserId, }) async {
-    final response = await blockUserFromCommentWithHttpInfo(tenantId, id, blockFromCommentParams,  userId: userId, anonUserId: anonUserId, );
+  Future<BlockSuccess?> blockUserFromComment(ApiBlockUserFromCommentRequest request,) async {
+    final response = await blockUserFromCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -528,7 +554,10 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, { bool? forceRecalculate, }) async {
+  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(ApiBulkAggregateQuestionResultsRequest request,) async {
+    final tenantId = request.tenantId;
+    final bulkAggregateQuestionResultsRequest = request.bulkAggregateQuestionResultsRequest;
+    final forceRecalculate = request.forceRecalculate;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation/bulk';
 
@@ -565,8 +594,8 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, { bool? forceRecalculate, }) async {
-    final response = await bulkAggregateQuestionResultsWithHttpInfo(tenantId, bulkAggregateQuestionResultsRequest,  forceRecalculate: forceRecalculate, );
+  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(ApiBulkAggregateQuestionResultsRequest request,) async {
+    final response = await bulkAggregateQuestionResultsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -590,7 +619,11 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ChangeTicketStateBody] changeTicketStateBody (required):
-  Future<Response> changeTicketStateWithHttpInfo(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody,) async {
+  Future<Response> changeTicketStateWithHttpInfo(ApiChangeTicketStateRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final id = request.id;
+    final changeTicketStateBody = request.changeTicketStateBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}/state'
       .replaceAll('{id}', id);
@@ -628,8 +661,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ChangeTicketStateBody] changeTicketStateBody (required):
-  Future<ChangeTicketStateResponse?> changeTicketState(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody,) async {
-    final response = await changeTicketStateWithHttpInfo(tenantId, userId, id, changeTicketStateBody,);
+  Future<ChangeTicketStateResponse?> changeTicketState(ApiChangeTicketStateRequest request,) async {
+    final response = await changeTicketStateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -663,7 +696,16 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(String tenantId, { String? questionId, List<String>? questionIds, String? urlId, DateTime? startDate, bool? forceRecalculate, double? minValue, double? maxValue, double? limit, }) async {
+  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(ApiCombineCommentsWithQuestionResultsRequest request,) async {
+    final tenantId = request.tenantId;
+    final questionId = request.questionId;
+    final questionIds = request.questionIds;
+    final urlId = request.urlId;
+    final startDate = request.startDate;
+    final forceRecalculate = request.forceRecalculate;
+    final minValue = request.minValue;
+    final maxValue = request.maxValue;
+    final limit = request.limit;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation/combine/comments';
 
@@ -733,8 +775,8 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(String tenantId, { String? questionId, List<String>? questionIds, String? urlId, DateTime? startDate, bool? forceRecalculate, double? minValue, double? maxValue, double? limit, }) async {
-    final response = await combineCommentsWithQuestionResultsWithHttpInfo(tenantId,  questionId: questionId, questionIds: questionIds, urlId: urlId, startDate: startDate, forceRecalculate: forceRecalculate, minValue: minValue, maxValue: maxValue, limit: limit, );
+  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(ApiCombineCommentsWithQuestionResultsRequest request,) async {
+    final response = await combineCommentsWithQuestionResultsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -754,7 +796,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateEmailTemplateBody] createEmailTemplateBody (required):
-  Future<Response> createEmailTemplateWithHttpInfo(String tenantId, CreateEmailTemplateBody createEmailTemplateBody,) async {
+  Future<Response> createEmailTemplateWithHttpInfo(ApiCreateEmailTemplateRequest request,) async {
+    final tenantId = request.tenantId;
+    final createEmailTemplateBody = request.createEmailTemplateBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -786,8 +830,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateEmailTemplateBody] createEmailTemplateBody (required):
-  Future<CreateEmailTemplateResponse?> createEmailTemplate(String tenantId, CreateEmailTemplateBody createEmailTemplateBody,) async {
-    final response = await createEmailTemplateWithHttpInfo(tenantId, createEmailTemplateBody,);
+  Future<CreateEmailTemplateResponse?> createEmailTemplate(ApiCreateEmailTemplateRequest request,) async {
+    final response = await createEmailTemplateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -815,7 +859,13 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<Response> createFeedPostWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, { String? broadcastId, bool? isLive, bool? doSpamCheck, bool? skipDupCheck, }) async {
+  Future<Response> createFeedPostWithHttpInfo(ApiCreateFeedPostRequest request,) async {
+    final tenantId = request.tenantId;
+    final createFeedPostParams = request.createFeedPostParams;
+    final broadcastId = request.broadcastId;
+    final isLive = request.isLive;
+    final doSpamCheck = request.doSpamCheck;
+    final skipDupCheck = request.skipDupCheck;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts';
 
@@ -867,8 +917,8 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<CreateFeedPostsResponse?> createFeedPost(String tenantId, CreateFeedPostParams createFeedPostParams, { String? broadcastId, bool? isLive, bool? doSpamCheck, bool? skipDupCheck, }) async {
-    final response = await createFeedPostWithHttpInfo(tenantId, createFeedPostParams,  broadcastId: broadcastId, isLive: isLive, doSpamCheck: doSpamCheck, skipDupCheck: skipDupCheck, );
+  Future<CreateFeedPostsResponse?> createFeedPost(ApiCreateFeedPostRequest request,) async {
+    final response = await createFeedPostWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -888,7 +938,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateModeratorBody] createModeratorBody (required):
-  Future<Response> createModeratorWithHttpInfo(String tenantId, CreateModeratorBody createModeratorBody,) async {
+  Future<Response> createModeratorWithHttpInfo(ApiCreateModeratorRequest request,) async {
+    final tenantId = request.tenantId;
+    final createModeratorBody = request.createModeratorBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -920,8 +972,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateModeratorBody] createModeratorBody (required):
-  Future<CreateModeratorResponse?> createModerator(String tenantId, CreateModeratorBody createModeratorBody,) async {
-    final response = await createModeratorWithHttpInfo(tenantId, createModeratorBody,);
+  Future<CreateModeratorResponse?> createModerator(ApiCreateModeratorRequest request,) async {
+    final response = await createModeratorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -941,7 +993,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionConfigBody] createQuestionConfigBody (required):
-  Future<Response> createQuestionConfigWithHttpInfo(String tenantId, CreateQuestionConfigBody createQuestionConfigBody,) async {
+  Future<Response> createQuestionConfigWithHttpInfo(ApiCreateQuestionConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final createQuestionConfigBody = request.createQuestionConfigBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -973,8 +1027,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionConfigBody] createQuestionConfigBody (required):
-  Future<CreateQuestionConfigResponse?> createQuestionConfig(String tenantId, CreateQuestionConfigBody createQuestionConfigBody,) async {
-    final response = await createQuestionConfigWithHttpInfo(tenantId, createQuestionConfigBody,);
+  Future<CreateQuestionConfigResponse?> createQuestionConfig(ApiCreateQuestionConfigRequest request,) async {
+    final response = await createQuestionConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -994,7 +1048,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionResultBody] createQuestionResultBody (required):
-  Future<Response> createQuestionResultWithHttpInfo(String tenantId, CreateQuestionResultBody createQuestionResultBody,) async {
+  Future<Response> createQuestionResultWithHttpInfo(ApiCreateQuestionResultRequest request,) async {
+    final tenantId = request.tenantId;
+    final createQuestionResultBody = request.createQuestionResultBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results';
 
@@ -1026,8 +1082,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionResultBody] createQuestionResultBody (required):
-  Future<CreateQuestionResultResponse?> createQuestionResult(String tenantId, CreateQuestionResultBody createQuestionResultBody,) async {
-    final response = await createQuestionResultWithHttpInfo(tenantId, createQuestionResultBody,);
+  Future<CreateQuestionResultResponse?> createQuestionResult(ApiCreateQuestionResultRequest request,) async {
+    final response = await createQuestionResultWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1047,7 +1103,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIUserSubscriptionData] createAPIUserSubscriptionData (required):
-  Future<Response> createSubscriptionWithHttpInfo(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData,) async {
+  Future<Response> createSubscriptionWithHttpInfo(ApiCreateSubscriptionRequest request,) async {
+    final tenantId = request.tenantId;
+    final createAPIUserSubscriptionData = request.createAPIUserSubscriptionData;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -1079,8 +1137,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIUserSubscriptionData] createAPIUserSubscriptionData (required):
-  Future<CreateSubscriptionAPIResponse?> createSubscription(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData,) async {
-    final response = await createSubscriptionWithHttpInfo(tenantId, createAPIUserSubscriptionData,);
+  Future<CreateSubscriptionAPIResponse?> createSubscription(ApiCreateSubscriptionRequest request,) async {
+    final response = await createSubscriptionWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1100,7 +1158,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantBody] createTenantBody (required):
-  Future<Response> createTenantWithHttpInfo(String tenantId, CreateTenantBody createTenantBody,) async {
+  Future<Response> createTenantWithHttpInfo(ApiCreateTenantRequest request,) async {
+    final tenantId = request.tenantId;
+    final createTenantBody = request.createTenantBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants';
 
@@ -1132,8 +1192,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantBody] createTenantBody (required):
-  Future<CreateTenantResponse?> createTenant(String tenantId, CreateTenantBody createTenantBody,) async {
-    final response = await createTenantWithHttpInfo(tenantId, createTenantBody,);
+  Future<CreateTenantResponse?> createTenant(ApiCreateTenantRequest request,) async {
+    final response = await createTenantWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1153,7 +1213,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantPackageBody] createTenantPackageBody (required):
-  Future<Response> createTenantPackageWithHttpInfo(String tenantId, CreateTenantPackageBody createTenantPackageBody,) async {
+  Future<Response> createTenantPackageWithHttpInfo(ApiCreateTenantPackageRequest request,) async {
+    final tenantId = request.tenantId;
+    final createTenantPackageBody = request.createTenantPackageBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -1185,8 +1247,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantPackageBody] createTenantPackageBody (required):
-  Future<CreateTenantPackageResponse?> createTenantPackage(String tenantId, CreateTenantPackageBody createTenantPackageBody,) async {
-    final response = await createTenantPackageWithHttpInfo(tenantId, createTenantPackageBody,);
+  Future<CreateTenantPackageResponse?> createTenantPackage(ApiCreateTenantPackageRequest request,) async {
+    final response = await createTenantPackageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1206,7 +1268,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantUserBody] createTenantUserBody (required):
-  Future<Response> createTenantUserWithHttpInfo(String tenantId, CreateTenantUserBody createTenantUserBody,) async {
+  Future<Response> createTenantUserWithHttpInfo(ApiCreateTenantUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final createTenantUserBody = request.createTenantUserBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -1238,8 +1302,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantUserBody] createTenantUserBody (required):
-  Future<CreateTenantUserResponse?> createTenantUser(String tenantId, CreateTenantUserBody createTenantUserBody,) async {
-    final response = await createTenantUserWithHttpInfo(tenantId, createTenantUserBody,);
+  Future<CreateTenantUserResponse?> createTenantUser(ApiCreateTenantUserRequest request,) async {
+    final response = await createTenantUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1261,7 +1325,10 @@ class DefaultApi {
   /// * [String] userId (required):
   ///
   /// * [CreateTicketBody] createTicketBody (required):
-  Future<Response> createTicketWithHttpInfo(String tenantId, String userId, CreateTicketBody createTicketBody,) async {
+  Future<Response> createTicketWithHttpInfo(ApiCreateTicketRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final createTicketBody = request.createTicketBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets';
 
@@ -1296,8 +1363,8 @@ class DefaultApi {
   /// * [String] userId (required):
   ///
   /// * [CreateTicketBody] createTicketBody (required):
-  Future<CreateTicketResponse?> createTicket(String tenantId, String userId, CreateTicketBody createTicketBody,) async {
-    final response = await createTicketWithHttpInfo(tenantId, userId, createTicketBody,);
+  Future<CreateTicketResponse?> createTicket(ApiCreateTicketRequest request,) async {
+    final response = await createTicketWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1317,7 +1384,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateUserBadgeParams] createUserBadgeParams (required):
-  Future<Response> createUserBadgeWithHttpInfo(String tenantId, CreateUserBadgeParams createUserBadgeParams,) async {
+  Future<Response> createUserBadgeWithHttpInfo(ApiCreateUserBadgeRequest request,) async {
+    final tenantId = request.tenantId;
+    final createUserBadgeParams = request.createUserBadgeParams;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges';
 
@@ -1349,8 +1418,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateUserBadgeParams] createUserBadgeParams (required):
-  Future<APICreateUserBadgeResponse?> createUserBadge(String tenantId, CreateUserBadgeParams createUserBadgeParams,) async {
-    final response = await createUserBadgeWithHttpInfo(tenantId, createUserBadgeParams,);
+  Future<APICreateUserBadgeResponse?> createUserBadge(ApiCreateUserBadgeRequest request,) async {
+    final response = await createUserBadgeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1376,7 +1445,12 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> createVoteWithHttpInfo(String tenantId, String commentId, String direction, { String? userId, String? anonUserId, }) async {
+  Future<Response> createVoteWithHttpInfo(ApiCreateVoteRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final direction = request.direction;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes';
 
@@ -1422,8 +1496,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<VoteResponse?> createVote(String tenantId, String commentId, String direction, { String? userId, String? anonUserId, }) async {
-    final response = await createVoteWithHttpInfo(tenantId, commentId, direction,  userId: userId, anonUserId: anonUserId, );
+  Future<VoteResponse?> createVote(ApiCreateVoteRequest request,) async {
+    final response = await createVoteWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1447,7 +1521,11 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<Response> deleteCommentWithHttpInfo(String tenantId, String id, { String? contextUserId, bool? isLive, }) async {
+  Future<Response> deleteCommentWithHttpInfo(ApiDeleteCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final contextUserId = request.contextUserId;
+    final isLive = request.isLive;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -1490,8 +1568,8 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<DeleteCommentResult?> deleteComment(String tenantId, String id, { String? contextUserId, bool? isLive, }) async {
-    final response = await deleteCommentWithHttpInfo(tenantId, id,  contextUserId: contextUserId, isLive: isLive, );
+  Future<DeleteCommentResult?> deleteComment(ApiDeleteCommentRequest request,) async {
+    final response = await deleteCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1511,7 +1589,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<Response> deleteDomainConfigWithHttpInfo(String tenantId, String domain,) async {
+  Future<Response> deleteDomainConfigWithHttpInfo(ApiDeleteDomainConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final domain = request.domain;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domain}'
       .replaceAll('{domain}', domain);
@@ -1544,8 +1624,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<DeleteDomainConfigResponse?> deleteDomainConfig(String tenantId, String domain,) async {
-    final response = await deleteDomainConfigWithHttpInfo(tenantId, domain,);
+  Future<DeleteDomainConfigResponse?> deleteDomainConfig(ApiDeleteDomainConfigRequest request,) async {
+    final response = await deleteDomainConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1565,7 +1645,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteEmailTemplateWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deleteEmailTemplateWithHttpInfo(ApiDeleteEmailTemplateRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -1598,8 +1680,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteEmailTemplate(String tenantId, String id,) async {
-    final response = await deleteEmailTemplateWithHttpInfo(tenantId, id,);
+  Future<APIEmptyResponse?> deleteEmailTemplate(ApiDeleteEmailTemplateRequest request,) async {
+    final response = await deleteEmailTemplateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1621,7 +1703,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] errorId (required):
-  Future<Response> deleteEmailTemplateRenderErrorWithHttpInfo(String tenantId, String id, String errorId,) async {
+  Future<Response> deleteEmailTemplateRenderErrorWithHttpInfo(ApiDeleteEmailTemplateRenderErrorRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final errorId = request.errorId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors/{errorId}'
       .replaceAll('{id}', id)
@@ -1657,8 +1742,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] errorId (required):
-  Future<APIEmptyResponse?> deleteEmailTemplateRenderError(String tenantId, String id, String errorId,) async {
-    final response = await deleteEmailTemplateRenderErrorWithHttpInfo(tenantId, id, errorId,);
+  Future<APIEmptyResponse?> deleteEmailTemplateRenderError(ApiDeleteEmailTemplateRenderErrorRequest request,) async {
+    final response = await deleteEmailTemplateRenderErrorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1680,7 +1765,10 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<Response> deleteHashTagWithHttpInfo(String tag, { String? tenantId, DeleteHashTagRequestBody? deleteHashTagRequestBody, }) async {
+  Future<Response> deleteHashTagWithHttpInfo(ApiDeleteHashTagRequest request,) async {
+    final tag = request.tag;
+    final tenantId = request.tenantId;
+    final deleteHashTagRequestBody = request.deleteHashTagRequestBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -1717,8 +1805,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<APIEmptyResponse?> deleteHashTag(String tag, { String? tenantId, DeleteHashTagRequestBody? deleteHashTagRequestBody, }) async {
-    final response = await deleteHashTagWithHttpInfo(tag,  tenantId: tenantId, deleteHashTagRequestBody: deleteHashTagRequestBody, );
+  Future<APIEmptyResponse?> deleteHashTag(ApiDeleteHashTagRequest request,) async {
+    final response = await deleteHashTagWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1740,7 +1828,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<Response> deleteModeratorWithHttpInfo(String tenantId, String id, { String? sendEmail, }) async {
+  Future<Response> deleteModeratorWithHttpInfo(ApiDeleteModeratorRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final sendEmail = request.sendEmail;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -1778,8 +1869,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<APIEmptyResponse?> deleteModerator(String tenantId, String id, { String? sendEmail, }) async {
-    final response = await deleteModeratorWithHttpInfo(tenantId, id,  sendEmail: sendEmail, );
+  Future<APIEmptyResponse?> deleteModerator(ApiDeleteModeratorRequest request,) async {
+    final response = await deleteModeratorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1799,7 +1890,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteNotificationCountWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deleteNotificationCountWithHttpInfo(ApiDeleteNotificationCountRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notification-count/{id}'
       .replaceAll('{id}', id);
@@ -1832,8 +1925,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteNotificationCount(String tenantId, String id,) async {
-    final response = await deleteNotificationCountWithHttpInfo(tenantId, id,);
+  Future<APIEmptyResponse?> deleteNotificationCount(ApiDeleteNotificationCountRequest request,) async {
+    final response = await deleteNotificationCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1853,7 +1946,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deletePageWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deletePageWithHttpInfo(ApiDeletePageRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/{id}'
       .replaceAll('{id}', id);
@@ -1886,8 +1981,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<DeletePageAPIResponse?> deletePage(String tenantId, String id,) async {
-    final response = await deletePageWithHttpInfo(tenantId, id,);
+  Future<DeletePageAPIResponse?> deletePage(ApiDeletePageRequest request,) async {
+    final response = await deletePageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1907,7 +2002,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deletePendingWebhookEventWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deletePendingWebhookEventWithHttpInfo(ApiDeletePendingWebhookEventRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events/{id}'
       .replaceAll('{id}', id);
@@ -1940,8 +2037,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deletePendingWebhookEvent(String tenantId, String id,) async {
-    final response = await deletePendingWebhookEventWithHttpInfo(tenantId, id,);
+  Future<APIEmptyResponse?> deletePendingWebhookEvent(ApiDeletePendingWebhookEventRequest request,) async {
+    final response = await deletePendingWebhookEventWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1961,7 +2058,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteQuestionConfigWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deleteQuestionConfigWithHttpInfo(ApiDeleteQuestionConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -1994,8 +2093,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteQuestionConfig(String tenantId, String id,) async {
-    final response = await deleteQuestionConfigWithHttpInfo(tenantId, id,);
+  Future<APIEmptyResponse?> deleteQuestionConfig(ApiDeleteQuestionConfigRequest request,) async {
+    final response = await deleteQuestionConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2015,7 +2114,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteQuestionResultWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deleteQuestionResultWithHttpInfo(ApiDeleteQuestionResultRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -2048,8 +2149,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteQuestionResult(String tenantId, String id,) async {
-    final response = await deleteQuestionResultWithHttpInfo(tenantId, id,);
+  Future<APIEmptyResponse?> deleteQuestionResult(ApiDeleteQuestionResultRequest request,) async {
+    final response = await deleteQuestionResultWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2073,7 +2174,11 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteSSOUserWithHttpInfo(String tenantId, String id, { bool? deleteComments, String? commentDeleteMode, }) async {
+  Future<Response> deleteSSOUserWithHttpInfo(ApiDeleteSSOUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final deleteComments = request.deleteComments;
+    final commentDeleteMode = request.commentDeleteMode;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -2116,8 +2221,8 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(String tenantId, String id, { bool? deleteComments, String? commentDeleteMode, }) async {
-    final response = await deleteSSOUserWithHttpInfo(tenantId, id,  deleteComments: deleteComments, commentDeleteMode: commentDeleteMode, );
+  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(ApiDeleteSSOUserRequest request,) async {
+    final response = await deleteSSOUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2139,7 +2244,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> deleteSubscriptionWithHttpInfo(String tenantId, String id, { String? userId, }) async {
+  Future<Response> deleteSubscriptionWithHttpInfo(ApiDeleteSubscriptionRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final userId = request.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -2177,8 +2285,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(String tenantId, String id, { String? userId, }) async {
-    final response = await deleteSubscriptionWithHttpInfo(tenantId, id,  userId: userId, );
+  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(ApiDeleteSubscriptionRequest request,) async {
+    final response = await deleteSubscriptionWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2200,7 +2308,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<Response> deleteTenantWithHttpInfo(String tenantId, String id, { String? sure, }) async {
+  Future<Response> deleteTenantWithHttpInfo(ApiDeleteTenantRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final sure = request.sure;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -2238,8 +2349,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<APIEmptyResponse?> deleteTenant(String tenantId, String id, { String? sure, }) async {
-    final response = await deleteTenantWithHttpInfo(tenantId, id,  sure: sure, );
+  Future<APIEmptyResponse?> deleteTenant(ApiDeleteTenantRequest request,) async {
+    final response = await deleteTenantWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2259,7 +2370,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteTenantPackageWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deleteTenantPackageWithHttpInfo(ApiDeleteTenantPackageRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -2292,8 +2405,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteTenantPackage(String tenantId, String id,) async {
-    final response = await deleteTenantPackageWithHttpInfo(tenantId, id,);
+  Future<APIEmptyResponse?> deleteTenantPackage(ApiDeleteTenantPackageRequest request,) async {
+    final response = await deleteTenantPackageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2317,7 +2430,11 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteTenantUserWithHttpInfo(String tenantId, String id, { String? deleteComments, String? commentDeleteMode, }) async {
+  Future<Response> deleteTenantUserWithHttpInfo(ApiDeleteTenantUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final deleteComments = request.deleteComments;
+    final commentDeleteMode = request.commentDeleteMode;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -2360,8 +2477,8 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<APIEmptyResponse?> deleteTenantUser(String tenantId, String id, { String? deleteComments, String? commentDeleteMode, }) async {
-    final response = await deleteTenantUserWithHttpInfo(tenantId, id,  deleteComments: deleteComments, commentDeleteMode: commentDeleteMode, );
+  Future<APIEmptyResponse?> deleteTenantUser(ApiDeleteTenantUserRequest request,) async {
+    final response = await deleteTenantUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2381,7 +2498,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteUserBadgeWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> deleteUserBadgeWithHttpInfo(ApiDeleteUserBadgeRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -2414,8 +2533,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptySuccessResponse?> deleteUserBadge(String tenantId, String id,) async {
-    final response = await deleteUserBadgeWithHttpInfo(tenantId, id,);
+  Future<APIEmptySuccessResponse?> deleteUserBadge(ApiDeleteUserBadgeRequest request,) async {
+    final response = await deleteUserBadgeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2437,7 +2556,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<Response> deleteVoteWithHttpInfo(String tenantId, String id, { String? editKey, }) async {
+  Future<Response> deleteVoteWithHttpInfo(ApiDeleteVoteRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final editKey = request.editKey;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes/{id}'
       .replaceAll('{id}', id);
@@ -2475,8 +2597,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<VoteDeleteResponse?> deleteVote(String tenantId, String id, { String? editKey, }) async {
-    final response = await deleteVoteWithHttpInfo(tenantId, id,  editKey: editKey, );
+  Future<VoteDeleteResponse?> deleteVote(ApiDeleteVoteRequest request,) async {
+    final response = await deleteVoteWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2500,7 +2622,11 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> flagCommentWithHttpInfo(String tenantId, String id, { String? userId, String? anonUserId, }) async {
+  Future<Response> flagCommentWithHttpInfo(ApiFlagCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/flag'
       .replaceAll('{id}', id);
@@ -2543,8 +2669,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> flagComment(String tenantId, String id, { String? userId, String? anonUserId, }) async {
-    final response = await flagCommentWithHttpInfo(tenantId, id,  userId: userId, anonUserId: anonUserId, );
+  Future<FlagCommentResponse?> flagComment(ApiFlagCommentRequest request,) async {
+    final response = await flagCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2572,7 +2698,13 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<Response> getAuditLogsWithHttpInfo(String tenantId, { double? limit, double? skip, SORTDIR? order, double? after, double? before, }) async {
+  Future<Response> getAuditLogsWithHttpInfo(ApiGetAuditLogsRequest request,) async {
+    final tenantId = request.tenantId;
+    final limit = request.limit;
+    final skip = request.skip;
+    final order = request.order;
+    final after = request.after;
+    final before = request.before;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/audit-logs';
 
@@ -2627,8 +2759,8 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<GetAuditLogsResponse?> getAuditLogs(String tenantId, { double? limit, double? skip, SORTDIR? order, double? after, double? before, }) async {
-    final response = await getAuditLogsWithHttpInfo(tenantId,  limit: limit, skip: skip, order: order, after: after, before: before, );
+  Future<GetAuditLogsResponse?> getAuditLogs(ApiGetAuditLogsRequest request,) async {
+    final response = await getAuditLogsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2648,7 +2780,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getCachedNotificationCountWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getCachedNotificationCountWithHttpInfo(ApiGetCachedNotificationCountRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notification-count/{id}'
       .replaceAll('{id}', id);
@@ -2681,8 +2815,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetCachedNotificationCountResponse?> getCachedNotificationCount(String tenantId, String id,) async {
-    final response = await getCachedNotificationCountWithHttpInfo(tenantId, id,);
+  Future<GetCachedNotificationCountResponse?> getCachedNotificationCount(ApiGetCachedNotificationCountRequest request,) async {
+    final response = await getCachedNotificationCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2702,7 +2836,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getCommentWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getCommentWithHttpInfo(ApiGetCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -2735,8 +2871,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetCommentResponse?> getComment(String tenantId, String id,) async {
-    final response = await getCommentWithHttpInfo(tenantId, id,);
+  Future<APIGetCommentResponse?> getComment(ApiGetCommentRequest request,) async {
+    final response = await getCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2786,7 +2922,24 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<Response> getCommentsWithHttpInfo(String tenantId, { int? page, int? limit, int? skip, bool? asTree, int? skipChildren, int? limitChildren, int? maxTreeDepth, String? urlId, String? userId, String? anonUserId, String? contextUserId, String? hashTag, String? parentId, SortDirections? direction, int? fromDate, int? toDate, }) async {
+  Future<Response> getCommentsWithHttpInfo(ApiGetCommentsRequest request,) async {
+    final tenantId = request.tenantId;
+    final page = request.page;
+    final limit = request.limit;
+    final skip = request.skip;
+    final asTree = request.asTree;
+    final skipChildren = request.skipChildren;
+    final limitChildren = request.limitChildren;
+    final maxTreeDepth = request.maxTreeDepth;
+    final urlId = request.urlId;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
+    final contextUserId = request.contextUserId;
+    final hashTag = request.hashTag;
+    final parentId = request.parentId;
+    final direction = request.direction;
+    final fromDate = request.fromDate;
+    final toDate = request.toDate;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments';
 
@@ -2896,8 +3049,8 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<APIGetCommentsResponse?> getComments(String tenantId, { int? page, int? limit, int? skip, bool? asTree, int? skipChildren, int? limitChildren, int? maxTreeDepth, String? urlId, String? userId, String? anonUserId, String? contextUserId, String? hashTag, String? parentId, SortDirections? direction, int? fromDate, int? toDate, }) async {
-    final response = await getCommentsWithHttpInfo(tenantId,  page: page, limit: limit, skip: skip, asTree: asTree, skipChildren: skipChildren, limitChildren: limitChildren, maxTreeDepth: maxTreeDepth, urlId: urlId, userId: userId, anonUserId: anonUserId, contextUserId: contextUserId, hashTag: hashTag, parentId: parentId, direction: direction, fromDate: fromDate, toDate: toDate, );
+  Future<APIGetCommentsResponse?> getComments(ApiGetCommentsRequest request,) async {
+    final response = await getCommentsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2917,7 +3070,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<Response> getDomainConfigWithHttpInfo(String tenantId, String domain,) async {
+  Future<Response> getDomainConfigWithHttpInfo(ApiGetDomainConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final domain = request.domain;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domain}'
       .replaceAll('{domain}', domain);
@@ -2950,8 +3105,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<GetDomainConfigResponse?> getDomainConfig(String tenantId, String domain,) async {
-    final response = await getDomainConfigWithHttpInfo(tenantId, domain,);
+  Future<GetDomainConfigResponse?> getDomainConfig(ApiGetDomainConfigRequest request,) async {
+    final response = await getDomainConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2969,7 +3124,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getDomainConfigsWithHttpInfo(String tenantId,) async {
+  Future<Response> getDomainConfigsWithHttpInfo(ApiGetDomainConfigsRequest request,) async {
+    final tenantId = request.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs';
 
@@ -2999,8 +3155,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetDomainConfigsResponse?> getDomainConfigs(String tenantId,) async {
-    final response = await getDomainConfigsWithHttpInfo(tenantId,);
+  Future<GetDomainConfigsResponse?> getDomainConfigs(ApiGetDomainConfigsRequest request,) async {
+    final response = await getDomainConfigsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3020,7 +3176,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getEmailTemplateWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getEmailTemplateWithHttpInfo(ApiGetEmailTemplateRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -3053,8 +3211,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetEmailTemplateResponse?> getEmailTemplate(String tenantId, String id,) async {
-    final response = await getEmailTemplateWithHttpInfo(tenantId, id,);
+  Future<GetEmailTemplateResponse?> getEmailTemplate(ApiGetEmailTemplateRequest request,) async {
+    final response = await getEmailTemplateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3072,7 +3230,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getEmailTemplateDefinitionsWithHttpInfo(String tenantId,) async {
+  Future<Response> getEmailTemplateDefinitionsWithHttpInfo(ApiGetEmailTemplateDefinitionsRequest request,) async {
+    final tenantId = request.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/definitions';
 
@@ -3102,8 +3261,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetEmailTemplateDefinitionsResponse?> getEmailTemplateDefinitions(String tenantId,) async {
-    final response = await getEmailTemplateDefinitionsWithHttpInfo(tenantId,);
+  Future<GetEmailTemplateDefinitionsResponse?> getEmailTemplateDefinitions(ApiGetEmailTemplateDefinitionsRequest request,) async {
+    final response = await getEmailTemplateDefinitionsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3125,7 +3284,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(String tenantId, String id, { double? skip, }) async {
+  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(ApiGetEmailTemplateRenderErrorsRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors'
       .replaceAll('{id}', id);
@@ -3163,8 +3325,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(String tenantId, String id, { double? skip, }) async {
-    final response = await getEmailTemplateRenderErrorsWithHttpInfo(tenantId, id,  skip: skip, );
+  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(ApiGetEmailTemplateRenderErrorsRequest request,) async {
+    final response = await getEmailTemplateRenderErrorsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3184,7 +3346,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplatesWithHttpInfo(String tenantId, { double? skip, }) async {
+  Future<Response> getEmailTemplatesWithHttpInfo(ApiGetEmailTemplatesRequest request,) async {
+    final tenantId = request.tenantId;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -3219,8 +3383,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplatesResponse?> getEmailTemplates(String tenantId, { double? skip, }) async {
-    final response = await getEmailTemplatesWithHttpInfo(tenantId,  skip: skip, );
+  Future<GetEmailTemplatesResponse?> getEmailTemplates(ApiGetEmailTemplatesRequest request,) async {
+    final response = await getEmailTemplatesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3247,7 +3411,11 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<Response> getFeedPostsWithHttpInfo(String tenantId, { String? afterId, int? limit, List<String>? tags, }) async {
+  Future<Response> getFeedPostsWithHttpInfo(ApiGetFeedPostsRequest request,) async {
+    final tenantId = request.tenantId;
+    final afterId = request.afterId;
+    final limit = request.limit;
+    final tags = request.tags;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts';
 
@@ -3294,8 +3462,8 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<GetFeedPostsResponse?> getFeedPosts(String tenantId, { String? afterId, int? limit, List<String>? tags, }) async {
-    final response = await getFeedPostsWithHttpInfo(tenantId,  afterId: afterId, limit: limit, tags: tags, );
+  Future<GetFeedPostsResponse?> getFeedPosts(ApiGetFeedPostsRequest request,) async {
+    final response = await getFeedPostsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3315,7 +3483,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<Response> getHashTagsWithHttpInfo(String tenantId, { double? page, }) async {
+  Future<Response> getHashTagsWithHttpInfo(ApiGetHashTagsRequest request,) async {
+    final tenantId = request.tenantId;
+    final page = request.page;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -3350,8 +3520,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<GetHashTagsResponse?> getHashTags(String tenantId, { double? page, }) async {
-    final response = await getHashTagsWithHttpInfo(tenantId,  page: page, );
+  Future<GetHashTagsResponse?> getHashTags(ApiGetHashTagsRequest request,) async {
+    final response = await getHashTagsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3371,7 +3541,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getModeratorWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getModeratorWithHttpInfo(ApiGetModeratorRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -3404,8 +3576,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetModeratorResponse?> getModerator(String tenantId, String id,) async {
-    final response = await getModeratorWithHttpInfo(tenantId, id,);
+  Future<GetModeratorResponse?> getModerator(ApiGetModeratorRequest request,) async {
+    final response = await getModeratorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3425,7 +3597,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getModeratorsWithHttpInfo(String tenantId, { double? skip, }) async {
+  Future<Response> getModeratorsWithHttpInfo(ApiGetModeratorsRequest request,) async {
+    final tenantId = request.tenantId;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -3460,8 +3634,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetModeratorsResponse?> getModerators(String tenantId, { double? skip, }) async {
-    final response = await getModeratorsWithHttpInfo(tenantId,  skip: skip, );
+  Future<GetModeratorsResponse?> getModerators(ApiGetModeratorsRequest request,) async {
+    final response = await getModeratorsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3489,7 +3663,13 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<Response> getNotificationCountWithHttpInfo(String tenantId, { String? userId, String? urlId, String? fromCommentId, bool? viewed, String? type, }) async {
+  Future<Response> getNotificationCountWithHttpInfo(ApiGetNotificationCountRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final urlId = request.urlId;
+    final fromCommentId = request.fromCommentId;
+    final viewed = request.viewed;
+    final type = request.type;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications/count';
 
@@ -3544,8 +3724,8 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<GetNotificationCountResponse?> getNotificationCount(String tenantId, { String? userId, String? urlId, String? fromCommentId, bool? viewed, String? type, }) async {
-    final response = await getNotificationCountWithHttpInfo(tenantId,  userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, );
+  Future<GetNotificationCountResponse?> getNotificationCount(ApiGetNotificationCountRequest request,) async {
+    final response = await getNotificationCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3575,7 +3755,14 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<Response> getNotificationsWithHttpInfo(String tenantId, { String? userId, String? urlId, String? fromCommentId, bool? viewed, String? type, double? skip, }) async {
+  Future<Response> getNotificationsWithHttpInfo(ApiGetNotificationsRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final urlId = request.urlId;
+    final fromCommentId = request.fromCommentId;
+    final viewed = request.viewed;
+    final type = request.type;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications';
 
@@ -3635,8 +3822,8 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<GetNotificationsResponse?> getNotifications(String tenantId, { String? userId, String? urlId, String? fromCommentId, bool? viewed, String? type, double? skip, }) async {
-    final response = await getNotificationsWithHttpInfo(tenantId,  userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, skip: skip, );
+  Future<GetNotificationsResponse?> getNotifications(ApiGetNotificationsRequest request,) async {
+    final response = await getNotificationsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3656,7 +3843,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getPageByURLIdWithHttpInfo(String tenantId, String urlId,) async {
+  Future<Response> getPageByURLIdWithHttpInfo(ApiGetPageByURLIdRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/by-url-id';
 
@@ -3689,8 +3878,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetPageByURLIdAPIResponse?> getPageByURLId(String tenantId, String urlId,) async {
-    final response = await getPageByURLIdWithHttpInfo(tenantId, urlId,);
+  Future<GetPageByURLIdAPIResponse?> getPageByURLId(ApiGetPageByURLIdRequest request,) async {
+    final response = await getPageByURLIdWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3708,7 +3897,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getPagesWithHttpInfo(String tenantId,) async {
+  Future<Response> getPagesWithHttpInfo(ApiGetPagesRequest request,) async {
+    final tenantId = request.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages';
 
@@ -3738,8 +3928,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetPagesAPIResponse?> getPages(String tenantId,) async {
-    final response = await getPagesWithHttpInfo(tenantId,);
+  Future<GetPagesAPIResponse?> getPages(ApiGetPagesRequest request,) async {
+    final response = await getPagesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3769,7 +3959,14 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<Response> getPendingWebhookEventCountWithHttpInfo(String tenantId, { String? commentId, String? externalId, String? eventType, String? type, String? domain, double? attemptCountGT, }) async {
+  Future<Response> getPendingWebhookEventCountWithHttpInfo(ApiGetPendingWebhookEventCountRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final externalId = request.externalId;
+    final eventType = request.eventType;
+    final type = request.type;
+    final domain = request.domain;
+    final attemptCountGT = request.attemptCountGT;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events/count';
 
@@ -3829,8 +4026,8 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(String tenantId, { String? commentId, String? externalId, String? eventType, String? type, String? domain, double? attemptCountGT, }) async {
-    final response = await getPendingWebhookEventCountWithHttpInfo(tenantId,  commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, );
+  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(ApiGetPendingWebhookEventCountRequest request,) async {
+    final response = await getPendingWebhookEventCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3862,7 +4059,15 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<Response> getPendingWebhookEventsWithHttpInfo(String tenantId, { String? commentId, String? externalId, String? eventType, String? type, String? domain, double? attemptCountGT, double? skip, }) async {
+  Future<Response> getPendingWebhookEventsWithHttpInfo(ApiGetPendingWebhookEventsRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final externalId = request.externalId;
+    final eventType = request.eventType;
+    final type = request.type;
+    final domain = request.domain;
+    final attemptCountGT = request.attemptCountGT;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events';
 
@@ -3927,8 +4132,8 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(String tenantId, { String? commentId, String? externalId, String? eventType, String? type, String? domain, double? attemptCountGT, double? skip, }) async {
-    final response = await getPendingWebhookEventsWithHttpInfo(tenantId,  commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, skip: skip, );
+  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(ApiGetPendingWebhookEventsRequest request,) async {
+    final response = await getPendingWebhookEventsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3948,7 +4153,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getQuestionConfigWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getQuestionConfigWithHttpInfo(ApiGetQuestionConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -3981,8 +4188,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetQuestionConfigResponse?> getQuestionConfig(String tenantId, String id,) async {
-    final response = await getQuestionConfigWithHttpInfo(tenantId, id,);
+  Future<GetQuestionConfigResponse?> getQuestionConfig(ApiGetQuestionConfigRequest request,) async {
+    final response = await getQuestionConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4002,7 +4209,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getQuestionConfigsWithHttpInfo(String tenantId, { double? skip, }) async {
+  Future<Response> getQuestionConfigsWithHttpInfo(ApiGetQuestionConfigsRequest request,) async {
+    final tenantId = request.tenantId;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -4037,8 +4246,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetQuestionConfigsResponse?> getQuestionConfigs(String tenantId, { double? skip, }) async {
-    final response = await getQuestionConfigsWithHttpInfo(tenantId,  skip: skip, );
+  Future<GetQuestionConfigsResponse?> getQuestionConfigs(ApiGetQuestionConfigsRequest request,) async {
+    final response = await getQuestionConfigsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4058,7 +4267,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getQuestionResultWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getQuestionResultWithHttpInfo(ApiGetQuestionResultRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -4091,8 +4302,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetQuestionResultResponse?> getQuestionResult(String tenantId, String id,) async {
-    final response = await getQuestionResultWithHttpInfo(tenantId, id,);
+  Future<GetQuestionResultResponse?> getQuestionResult(ApiGetQuestionResultRequest request,) async {
+    final response = await getQuestionResultWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4122,7 +4333,14 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<Response> getQuestionResultsWithHttpInfo(String tenantId, { String? urlId, String? userId, String? startDate, String? questionId, String? questionIds, double? skip, }) async {
+  Future<Response> getQuestionResultsWithHttpInfo(ApiGetQuestionResultsRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final userId = request.userId;
+    final startDate = request.startDate;
+    final questionId = request.questionId;
+    final questionIds = request.questionIds;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results';
 
@@ -4182,8 +4400,8 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<GetQuestionResultsResponse?> getQuestionResults(String tenantId, { String? urlId, String? userId, String? startDate, String? questionId, String? questionIds, double? skip, }) async {
-    final response = await getQuestionResultsWithHttpInfo(tenantId,  urlId: urlId, userId: userId, startDate: startDate, questionId: questionId, questionIds: questionIds, skip: skip, );
+  Future<GetQuestionResultsResponse?> getQuestionResults(ApiGetQuestionResultsRequest request,) async {
+    final response = await getQuestionResultsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4203,7 +4421,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] email (required):
-  Future<Response> getSSOUserByEmailWithHttpInfo(String tenantId, String email,) async {
+  Future<Response> getSSOUserByEmailWithHttpInfo(ApiGetSSOUserByEmailRequest request,) async {
+    final tenantId = request.tenantId;
+    final email = request.email;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/by-email/{email}'
       .replaceAll('{email}', email);
@@ -4236,8 +4456,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] email (required):
-  Future<GetSSOUserByEmailAPIResponse?> getSSOUserByEmail(String tenantId, String email,) async {
-    final response = await getSSOUserByEmailWithHttpInfo(tenantId, email,);
+  Future<GetSSOUserByEmailAPIResponse?> getSSOUserByEmail(ApiGetSSOUserByEmailRequest request,) async {
+    final response = await getSSOUserByEmailWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4257,7 +4477,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getSSOUserByIdWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getSSOUserByIdWithHttpInfo(ApiGetSSOUserByIdRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/by-id/{id}'
       .replaceAll('{id}', id);
@@ -4290,8 +4512,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetSSOUserByIdAPIResponse?> getSSOUserById(String tenantId, String id,) async {
-    final response = await getSSOUserByIdWithHttpInfo(tenantId, id,);
+  Future<GetSSOUserByIdAPIResponse?> getSSOUserById(ApiGetSSOUserByIdRequest request,) async {
+    final response = await getSSOUserByIdWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4311,7 +4533,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<Response> getSSOUsersWithHttpInfo(String tenantId, { int? skip, }) async {
+  Future<Response> getSSOUsersWithHttpInfo(ApiGetSSOUsersRequest request,) async {
+    final tenantId = request.tenantId;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -4346,8 +4570,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<GetSSOUsersResponse?> getSSOUsers(String tenantId, { int? skip, }) async {
-    final response = await getSSOUsersWithHttpInfo(tenantId,  skip: skip, );
+  Future<GetSSOUsersResponse?> getSSOUsers(ApiGetSSOUsersRequest request,) async {
+    final response = await getSSOUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4367,7 +4591,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<Response> getSubscriptionsWithHttpInfo(String tenantId, { String? userId, }) async {
+  Future<Response> getSubscriptionsWithHttpInfo(ApiGetSubscriptionsRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -4402,8 +4628,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<GetSubscriptionsAPIResponse?> getSubscriptions(String tenantId, { String? userId, }) async {
-    final response = await getSubscriptionsWithHttpInfo(tenantId,  userId: userId, );
+  Future<GetSubscriptionsAPIResponse?> getSubscriptions(ApiGetSubscriptionsRequest request,) async {
+    final response = await getSubscriptionsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4423,7 +4649,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getTenantWithHttpInfo(ApiGetTenantRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -4456,8 +4684,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantResponse?> getTenant(String tenantId, String id,) async {
-    final response = await getTenantWithHttpInfo(tenantId, id,);
+  Future<GetTenantResponse?> getTenant(ApiGetTenantRequest request,) async {
+    final response = await getTenantWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4483,7 +4711,12 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<Response> getTenantDailyUsagesWithHttpInfo(String tenantId, { double? yearNumber, double? monthNumber, double? dayNumber, double? skip, }) async {
+  Future<Response> getTenantDailyUsagesWithHttpInfo(ApiGetTenantDailyUsagesRequest request,) async {
+    final tenantId = request.tenantId;
+    final yearNumber = request.yearNumber;
+    final monthNumber = request.monthNumber;
+    final dayNumber = request.dayNumber;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-daily-usage';
 
@@ -4533,8 +4766,8 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(String tenantId, { double? yearNumber, double? monthNumber, double? dayNumber, double? skip, }) async {
-    final response = await getTenantDailyUsagesWithHttpInfo(tenantId,  yearNumber: yearNumber, monthNumber: monthNumber, dayNumber: dayNumber, skip: skip, );
+  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(ApiGetTenantDailyUsagesRequest request,) async {
+    final response = await getTenantDailyUsagesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4554,7 +4787,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantPackageWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getTenantPackageWithHttpInfo(ApiGetTenantPackageRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -4587,8 +4822,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantPackageResponse?> getTenantPackage(String tenantId, String id,) async {
-    final response = await getTenantPackageWithHttpInfo(tenantId, id,);
+  Future<GetTenantPackageResponse?> getTenantPackage(ApiGetTenantPackageRequest request,) async {
+    final response = await getTenantPackageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4608,7 +4843,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantPackagesWithHttpInfo(String tenantId, { double? skip, }) async {
+  Future<Response> getTenantPackagesWithHttpInfo(ApiGetTenantPackagesRequest request,) async {
+    final tenantId = request.tenantId;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -4643,8 +4880,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantPackagesResponse?> getTenantPackages(String tenantId, { double? skip, }) async {
-    final response = await getTenantPackagesWithHttpInfo(tenantId,  skip: skip, );
+  Future<GetTenantPackagesResponse?> getTenantPackages(ApiGetTenantPackagesRequest request,) async {
+    final response = await getTenantPackagesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4664,7 +4901,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantUserWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getTenantUserWithHttpInfo(ApiGetTenantUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -4697,8 +4936,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantUserResponse?> getTenantUser(String tenantId, String id,) async {
-    final response = await getTenantUserWithHttpInfo(tenantId, id,);
+  Future<GetTenantUserResponse?> getTenantUser(ApiGetTenantUserRequest request,) async {
+    final response = await getTenantUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4718,7 +4957,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantUsersWithHttpInfo(String tenantId, { double? skip, }) async {
+  Future<Response> getTenantUsersWithHttpInfo(ApiGetTenantUsersRequest request,) async {
+    final tenantId = request.tenantId;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -4753,8 +4994,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantUsersResponse?> getTenantUsers(String tenantId, { double? skip, }) async {
-    final response = await getTenantUsersWithHttpInfo(tenantId,  skip: skip, );
+  Future<GetTenantUsersResponse?> getTenantUsers(ApiGetTenantUsersRequest request,) async {
+    final response = await getTenantUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4776,7 +5017,10 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<Response> getTenantsWithHttpInfo(String tenantId, { String? meta, double? skip, }) async {
+  Future<Response> getTenantsWithHttpInfo(ApiGetTenantsRequest request,) async {
+    final tenantId = request.tenantId;
+    final meta = request.meta;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants';
 
@@ -4816,8 +5060,8 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<GetTenantsResponse?> getTenants(String tenantId, { String? meta, double? skip, }) async {
-    final response = await getTenantsWithHttpInfo(tenantId,  meta: meta, skip: skip, );
+  Future<GetTenantsResponse?> getTenants(ApiGetTenantsRequest request,) async {
+    final response = await getTenantsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4839,7 +5083,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> getTicketWithHttpInfo(String tenantId, String id, { String? userId, }) async {
+  Future<Response> getTicketWithHttpInfo(ApiGetTicketRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final userId = request.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}'
       .replaceAll('{id}', id);
@@ -4877,8 +5124,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<GetTicketResponse?> getTicket(String tenantId, String id, { String? userId, }) async {
-    final response = await getTicketWithHttpInfo(tenantId, id,  userId: userId, );
+  Future<GetTicketResponse?> getTicket(ApiGetTicketRequest request,) async {
+    final response = await getTicketWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4904,7 +5151,12 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<Response> getTicketsWithHttpInfo(String tenantId, { String? userId, double? state, double? skip, double? limit, }) async {
+  Future<Response> getTicketsWithHttpInfo(ApiGetTicketsRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final state = request.state;
+    final skip = request.skip;
+    final limit = request.limit;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets';
 
@@ -4954,8 +5206,8 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<GetTicketsResponse?> getTickets(String tenantId, { String? userId, double? state, double? skip, double? limit, }) async {
-    final response = await getTicketsWithHttpInfo(tenantId,  userId: userId, state: state, skip: skip, limit: limit, );
+  Future<GetTicketsResponse?> getTickets(ApiGetTicketsRequest request,) async {
+    final response = await getTicketsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4975,7 +5227,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getUserWithHttpInfo(ApiGetUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/users/{id}'
       .replaceAll('{id}', id);
@@ -5008,8 +5262,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetUserResponse?> getUser(String tenantId, String id,) async {
-    final response = await getUserWithHttpInfo(tenantId, id,);
+  Future<GetUserResponse?> getUser(ApiGetUserRequest request,) async {
+    final response = await getUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5029,7 +5283,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserBadgeWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getUserBadgeWithHttpInfo(ApiGetUserBadgeRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -5062,8 +5318,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetUserBadgeResponse?> getUserBadge(String tenantId, String id,) async {
-    final response = await getUserBadgeWithHttpInfo(tenantId, id,);
+  Future<APIGetUserBadgeResponse?> getUserBadge(ApiGetUserBadgeRequest request,) async {
+    final response = await getUserBadgeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5083,7 +5339,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserBadgeProgressByIdWithHttpInfo(String tenantId, String id,) async {
+  Future<Response> getUserBadgeProgressByIdWithHttpInfo(ApiGetUserBadgeProgressByIdRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress/{id}'
       .replaceAll('{id}', id);
@@ -5116,8 +5374,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressById(String tenantId, String id,) async {
-    final response = await getUserBadgeProgressByIdWithHttpInfo(tenantId, id,);
+  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressById(ApiGetUserBadgeProgressByIdRequest request,) async {
+    final response = await getUserBadgeProgressByIdWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5137,7 +5395,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId (required):
-  Future<Response> getUserBadgeProgressByUserIdWithHttpInfo(String tenantId, String userId,) async {
+  Future<Response> getUserBadgeProgressByUserIdWithHttpInfo(ApiGetUserBadgeProgressByUserIdRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress/user/{userId}'
       .replaceAll('{userId}', userId);
@@ -5170,8 +5430,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId (required):
-  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressByUserId(String tenantId, String userId,) async {
-    final response = await getUserBadgeProgressByUserIdWithHttpInfo(tenantId, userId,);
+  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressByUserId(ApiGetUserBadgeProgressByUserIdRequest request,) async {
+    final response = await getUserBadgeProgressByUserIdWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5195,7 +5455,11 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgeProgressListWithHttpInfo(String tenantId, { String? userId, double? limit, double? skip, }) async {
+  Future<Response> getUserBadgeProgressListWithHttpInfo(ApiGetUserBadgeProgressListRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final limit = request.limit;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress';
 
@@ -5240,8 +5504,8 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(String tenantId, { String? userId, double? limit, double? skip, }) async {
-    final response = await getUserBadgeProgressListWithHttpInfo(tenantId,  userId: userId, limit: limit, skip: skip, );
+  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(ApiGetUserBadgeProgressListRequest request,) async {
+    final response = await getUserBadgeProgressListWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5271,7 +5535,14 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgesWithHttpInfo(String tenantId, { String? userId, String? badgeId, double? type, bool? displayedOnComments, double? limit, double? skip, }) async {
+  Future<Response> getUserBadgesWithHttpInfo(ApiGetUserBadgesRequest request,) async {
+    final tenantId = request.tenantId;
+    final userId = request.userId;
+    final badgeId = request.badgeId;
+    final type = request.type;
+    final displayedOnComments = request.displayedOnComments;
+    final limit = request.limit;
+    final skip = request.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges';
 
@@ -5331,8 +5602,8 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgesResponse?> getUserBadges(String tenantId, { String? userId, String? badgeId, double? type, bool? displayedOnComments, double? limit, double? skip, }) async {
-    final response = await getUserBadgesWithHttpInfo(tenantId,  userId: userId, badgeId: badgeId, type: type, displayedOnComments: displayedOnComments, limit: limit, skip: skip, );
+  Future<APIGetUserBadgesResponse?> getUserBadges(ApiGetUserBadgesRequest request,) async {
+    final response = await getUserBadgesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5352,7 +5623,9 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getVotesWithHttpInfo(String tenantId, String urlId,) async {
+  Future<Response> getVotesWithHttpInfo(ApiGetVotesRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes';
 
@@ -5385,8 +5658,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetVotesResponse?> getVotes(String tenantId, String urlId,) async {
-    final response = await getVotesWithHttpInfo(tenantId, urlId,);
+  Future<GetVotesResponse?> getVotes(ApiGetVotesRequest request,) async {
+    final response = await getVotesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5410,7 +5683,11 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> getVotesForUserWithHttpInfo(String tenantId, String urlId, { String? userId, String? anonUserId, }) async {
+  Future<Response> getVotesForUserWithHttpInfo(ApiGetVotesForUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes/for-user';
 
@@ -5453,8 +5730,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<GetVotesForUserResponse?> getVotesForUser(String tenantId, String urlId, { String? userId, String? anonUserId, }) async {
-    final response = await getVotesForUserWithHttpInfo(tenantId, urlId,  userId: userId, anonUserId: anonUserId, );
+  Future<GetVotesForUserResponse?> getVotesForUser(ApiGetVotesForUserRequest request,) async {
+    final response = await getVotesForUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5476,7 +5753,10 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [PatchDomainConfigParams] patchDomainConfigParams (required):
-  Future<Response> patchDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams,) async {
+  Future<Response> patchDomainConfigWithHttpInfo(ApiPatchDomainConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final domainToUpdate = request.domainToUpdate;
+    final patchDomainConfigParams = request.patchDomainConfigParams;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domainToUpdate}'
       .replaceAll('{domainToUpdate}', domainToUpdate);
@@ -5511,8 +5791,8 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [PatchDomainConfigParams] patchDomainConfigParams (required):
-  Future<PatchDomainConfigResponse?> patchDomainConfig(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams,) async {
-    final response = await patchDomainConfigWithHttpInfo(tenantId, domainToUpdate, patchDomainConfigParams,);
+  Future<PatchDomainConfigResponse?> patchDomainConfig(ApiPatchDomainConfigRequest request,) async {
+    final response = await patchDomainConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5534,7 +5814,10 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<Response> patchHashTagWithHttpInfo(String tag, { String? tenantId, UpdateHashTagBody? updateHashTagBody, }) async {
+  Future<Response> patchHashTagWithHttpInfo(ApiPatchHashTagRequest request,) async {
+    final tag = request.tag;
+    final tenantId = request.tenantId;
+    final updateHashTagBody = request.updateHashTagBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -5571,8 +5854,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<UpdateHashTagResponse?> patchHashTag(String tag, { String? tenantId, UpdateHashTagBody? updateHashTagBody, }) async {
-    final response = await patchHashTagWithHttpInfo(tag,  tenantId: tenantId, updateHashTagBody: updateHashTagBody, );
+  Future<UpdateHashTagResponse?> patchHashTag(ApiPatchHashTagRequest request,) async {
+    final response = await patchHashTagWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5594,7 +5877,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateAPIPageData] updateAPIPageData (required):
-  Future<Response> patchPageWithHttpInfo(String tenantId, String id, UpdateAPIPageData updateAPIPageData,) async {
+  Future<Response> patchPageWithHttpInfo(ApiPatchPageRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateAPIPageData = request.updateAPIPageData;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/{id}'
       .replaceAll('{id}', id);
@@ -5629,8 +5915,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateAPIPageData] updateAPIPageData (required):
-  Future<PatchPageAPIResponse?> patchPage(String tenantId, String id, UpdateAPIPageData updateAPIPageData,) async {
-    final response = await patchPageWithHttpInfo(tenantId, id, updateAPIPageData,);
+  Future<PatchPageAPIResponse?> patchPage(ApiPatchPageRequest request,) async {
+    final response = await patchPageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5654,7 +5940,11 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> patchSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, { bool? updateComments, }) async {
+  Future<Response> patchSSOUserWithHttpInfo(ApiPatchSSOUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateAPISSOUserData = request.updateAPISSOUserData;
+    final updateComments = request.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5694,8 +5984,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PatchSSOUserAPIResponse?> patchSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, { bool? updateComments, }) async {
-    final response = await patchSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData,  updateComments: updateComments, );
+  Future<PatchSSOUserAPIResponse?> patchSSOUser(ApiPatchSSOUserRequest request,) async {
+    final response = await patchSSOUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5717,7 +6007,10 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [UpdateDomainConfigParams] updateDomainConfigParams (required):
-  Future<Response> putDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams,) async {
+  Future<Response> putDomainConfigWithHttpInfo(ApiPutDomainConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final domainToUpdate = request.domainToUpdate;
+    final updateDomainConfigParams = request.updateDomainConfigParams;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domainToUpdate}'
       .replaceAll('{domainToUpdate}', domainToUpdate);
@@ -5752,8 +6045,8 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [UpdateDomainConfigParams] updateDomainConfigParams (required):
-  Future<PutDomainConfigResponse?> putDomainConfig(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams,) async {
-    final response = await putDomainConfigWithHttpInfo(tenantId, domainToUpdate, updateDomainConfigParams,);
+  Future<PutDomainConfigResponse?> putDomainConfig(ApiPutDomainConfigRequest request,) async {
+    final response = await putDomainConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5777,7 +6070,11 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> putSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, { bool? updateComments, }) async {
+  Future<Response> putSSOUserWithHttpInfo(ApiPutSSOUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateAPISSOUserData = request.updateAPISSOUserData;
+    final updateComments = request.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5817,8 +6114,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PutSSOUserAPIResponse?> putSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, { bool? updateComments, }) async {
-    final response = await putSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData,  updateComments: updateComments, );
+  Future<PutSSOUserAPIResponse?> putSSOUser(ApiPutSSOUserRequest request,) async {
+    final response = await putSSOUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5840,7 +6137,10 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<Response> renderEmailTemplateWithHttpInfo(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, { String? locale, }) async {
+  Future<Response> renderEmailTemplateWithHttpInfo(ApiRenderEmailTemplateRequest request,) async {
+    final tenantId = request.tenantId;
+    final renderEmailTemplateBody = request.renderEmailTemplateBody;
+    final locale = request.locale;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/render';
 
@@ -5877,8 +6177,8 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<RenderEmailTemplateResponse?> renderEmailTemplate(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, { String? locale, }) async {
-    final response = await renderEmailTemplateWithHttpInfo(tenantId, renderEmailTemplateBody,  locale: locale, );
+  Future<RenderEmailTemplateResponse?> renderEmailTemplate(ApiRenderEmailTemplateRequest request,) async {
+    final response = await renderEmailTemplateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5900,7 +6200,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ReplaceTenantPackageBody] replaceTenantPackageBody (required):
-  Future<Response> replaceTenantPackageWithHttpInfo(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody,) async {
+  Future<Response> replaceTenantPackageWithHttpInfo(ApiReplaceTenantPackageRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final replaceTenantPackageBody = request.replaceTenantPackageBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -5935,8 +6238,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ReplaceTenantPackageBody] replaceTenantPackageBody (required):
-  Future<APIEmptyResponse?> replaceTenantPackage(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody,) async {
-    final response = await replaceTenantPackageWithHttpInfo(tenantId, id, replaceTenantPackageBody,);
+  Future<APIEmptyResponse?> replaceTenantPackage(ApiReplaceTenantPackageRequest request,) async {
+    final response = await replaceTenantPackageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5960,7 +6263,11 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> replaceTenantUserWithHttpInfo(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, { String? updateComments, }) async {
+  Future<Response> replaceTenantUserWithHttpInfo(ApiReplaceTenantUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final replaceTenantUserBody = request.replaceTenantUserBody;
+    final updateComments = request.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -6000,8 +6307,8 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> replaceTenantUser(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, { String? updateComments, }) async {
-    final response = await replaceTenantUserWithHttpInfo(tenantId, id, replaceTenantUserBody,  updateComments: updateComments, );
+  Future<APIEmptyResponse?> replaceTenantUser(ApiReplaceTenantUserRequest request,) async {
+    final response = await replaceTenantUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6029,7 +6336,13 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentWithHttpInfo(String tenantId, CreateCommentParams createCommentParams, { bool? isLive, bool? doSpamCheck, bool? sendEmails, bool? populateNotifications, }) async {
+  Future<Response> saveCommentWithHttpInfo(ApiSaveCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final createCommentParams = request.createCommentParams;
+    final isLive = request.isLive;
+    final doSpamCheck = request.doSpamCheck;
+    final sendEmails = request.sendEmails;
+    final populateNotifications = request.populateNotifications;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments';
 
@@ -6081,8 +6394,8 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<APISaveCommentResponse?> saveComment(String tenantId, CreateCommentParams createCommentParams, { bool? isLive, bool? doSpamCheck, bool? sendEmails, bool? populateNotifications, }) async {
-    final response = await saveCommentWithHttpInfo(tenantId, createCommentParams,  isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications, );
+  Future<APISaveCommentResponse?> saveComment(ApiSaveCommentRequest request,) async {
+    final response = await saveCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6110,7 +6423,13 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentsBulkWithHttpInfo(String tenantId, List<CreateCommentParams> createCommentParams, { bool? isLive, bool? doSpamCheck, bool? sendEmails, bool? populateNotifications, }) async {
+  Future<Response> saveCommentsBulkWithHttpInfo(ApiSaveCommentsBulkRequest request,) async {
+    final tenantId = request.tenantId;
+    final createCommentParams = request.createCommentParams;
+    final isLive = request.isLive;
+    final doSpamCheck = request.doSpamCheck;
+    final sendEmails = request.sendEmails;
+    final populateNotifications = request.populateNotifications;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/bulk';
 
@@ -6162,8 +6481,8 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(String tenantId, List<CreateCommentParams> createCommentParams, { bool? isLive, bool? doSpamCheck, bool? sendEmails, bool? populateNotifications, }) async {
-    final response = await saveCommentsBulkWithHttpInfo(tenantId, createCommentParams,  isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications, );
+  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(ApiSaveCommentsBulkRequest request,) async {
+    final response = await saveCommentsBulkWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6188,7 +6507,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] fromName (required):
-  Future<Response> sendInviteWithHttpInfo(String tenantId, String id, String fromName,) async {
+  Future<Response> sendInviteWithHttpInfo(ApiSendInviteRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final fromName = request.fromName;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}/send-invite'
       .replaceAll('{id}', id);
@@ -6224,8 +6546,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] fromName (required):
-  Future<APIEmptyResponse?> sendInvite(String tenantId, String id, String fromName,) async {
-    final response = await sendInviteWithHttpInfo(tenantId, id, fromName,);
+  Future<APIEmptyResponse?> sendInvite(ApiSendInviteRequest request,) async {
+    final response = await sendInviteWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6247,7 +6569,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<Response> sendLoginLinkWithHttpInfo(String tenantId, String id, { String? redirectURL, }) async {
+  Future<Response> sendLoginLinkWithHttpInfo(ApiSendLoginLinkRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final redirectURL = request.redirectURL;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}/send-login-link'
       .replaceAll('{id}', id);
@@ -6285,8 +6610,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<APIEmptyResponse?> sendLoginLink(String tenantId, String id, { String? redirectURL, }) async {
-    final response = await sendLoginLinkWithHttpInfo(tenantId, id,  redirectURL: redirectURL, );
+  Future<APIEmptyResponse?> sendLoginLink(ApiSendLoginLinkRequest request,) async {
+    final response = await sendLoginLinkWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6312,7 +6637,12 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unBlockUserFromCommentWithHttpInfo(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, { String? userId, String? anonUserId, }) async {
+  Future<Response> unBlockUserFromCommentWithHttpInfo(ApiUnBlockUserFromCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final unBlockFromCommentParams = request.unBlockFromCommentParams;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/un-block'
       .replaceAll('{id}', id);
@@ -6357,8 +6687,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<UnblockSuccess?> unBlockUserFromComment(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, { String? userId, String? anonUserId, }) async {
-    final response = await unBlockUserFromCommentWithHttpInfo(tenantId, id, unBlockFromCommentParams,  userId: userId, anonUserId: anonUserId, );
+  Future<UnblockSuccess?> unBlockUserFromComment(ApiUnBlockUserFromCommentRequest request,) async {
+    final response = await unBlockUserFromCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6382,7 +6712,11 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unFlagCommentWithHttpInfo(String tenantId, String id, { String? userId, String? anonUserId, }) async {
+  Future<Response> unFlagCommentWithHttpInfo(ApiUnFlagCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final userId = request.userId;
+    final anonUserId = request.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/un-flag'
       .replaceAll('{id}', id);
@@ -6425,8 +6759,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> unFlagComment(String tenantId, String id, { String? userId, String? anonUserId, }) async {
-    final response = await unFlagCommentWithHttpInfo(tenantId, id,  userId: userId, anonUserId: anonUserId, );
+  Future<FlagCommentResponse?> unFlagComment(ApiUnFlagCommentRequest request,) async {
+    final response = await unFlagCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6454,7 +6788,13 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<Response> updateCommentWithHttpInfo(String tenantId, String id, UpdatableCommentParams updatableCommentParams, { String? contextUserId, bool? doSpamCheck, bool? isLive, }) async {
+  Future<Response> updateCommentWithHttpInfo(ApiUpdateCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updatableCommentParams = request.updatableCommentParams;
+    final contextUserId = request.contextUserId;
+    final doSpamCheck = request.doSpamCheck;
+    final isLive = request.isLive;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -6504,8 +6844,8 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<APIEmptyResponse?> updateComment(String tenantId, String id, UpdatableCommentParams updatableCommentParams, { String? contextUserId, bool? doSpamCheck, bool? isLive, }) async {
-    final response = await updateCommentWithHttpInfo(tenantId, id, updatableCommentParams,  contextUserId: contextUserId, doSpamCheck: doSpamCheck, isLive: isLive, );
+  Future<APIEmptyResponse?> updateComment(ApiUpdateCommentRequest request,) async {
+    final response = await updateCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6527,7 +6867,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateEmailTemplateBody] updateEmailTemplateBody (required):
-  Future<Response> updateEmailTemplateWithHttpInfo(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody,) async {
+  Future<Response> updateEmailTemplateWithHttpInfo(ApiUpdateEmailTemplateRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateEmailTemplateBody = request.updateEmailTemplateBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -6562,8 +6905,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateEmailTemplateBody] updateEmailTemplateBody (required):
-  Future<APIEmptyResponse?> updateEmailTemplate(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody,) async {
-    final response = await updateEmailTemplateWithHttpInfo(tenantId, id, updateEmailTemplateBody,);
+  Future<APIEmptyResponse?> updateEmailTemplate(ApiUpdateEmailTemplateRequest request,) async {
+    final response = await updateEmailTemplateWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6585,7 +6928,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [FeedPost] feedPost (required):
-  Future<Response> updateFeedPostWithHttpInfo(String tenantId, String id, FeedPost feedPost,) async {
+  Future<Response> updateFeedPostWithHttpInfo(ApiUpdateFeedPostRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final feedPost = request.feedPost;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts/{id}'
       .replaceAll('{id}', id);
@@ -6620,8 +6966,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [FeedPost] feedPost (required):
-  Future<APIEmptyResponse?> updateFeedPost(String tenantId, String id, FeedPost feedPost,) async {
-    final response = await updateFeedPostWithHttpInfo(tenantId, id, feedPost,);
+  Future<APIEmptyResponse?> updateFeedPost(ApiUpdateFeedPostRequest request,) async {
+    final response = await updateFeedPostWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6643,7 +6989,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateModeratorBody] updateModeratorBody (required):
-  Future<Response> updateModeratorWithHttpInfo(String tenantId, String id, UpdateModeratorBody updateModeratorBody,) async {
+  Future<Response> updateModeratorWithHttpInfo(ApiUpdateModeratorRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateModeratorBody = request.updateModeratorBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -6678,8 +7027,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateModeratorBody] updateModeratorBody (required):
-  Future<APIEmptyResponse?> updateModerator(String tenantId, String id, UpdateModeratorBody updateModeratorBody,) async {
-    final response = await updateModeratorWithHttpInfo(tenantId, id, updateModeratorBody,);
+  Future<APIEmptyResponse?> updateModerator(ApiUpdateModeratorRequest request,) async {
+    final response = await updateModeratorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6703,7 +7052,11 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<Response> updateNotificationWithHttpInfo(String tenantId, String id, UpdateNotificationBody updateNotificationBody, { String? userId, }) async {
+  Future<Response> updateNotificationWithHttpInfo(ApiUpdateNotificationRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateNotificationBody = request.updateNotificationBody;
+    final userId = request.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications/{id}'
       .replaceAll('{id}', id);
@@ -6743,8 +7096,8 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<APIEmptyResponse?> updateNotification(String tenantId, String id, UpdateNotificationBody updateNotificationBody, { String? userId, }) async {
-    final response = await updateNotificationWithHttpInfo(tenantId, id, updateNotificationBody,  userId: userId, );
+  Future<APIEmptyResponse?> updateNotification(ApiUpdateNotificationRequest request,) async {
+    final response = await updateNotificationWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6766,7 +7119,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionConfigBody] updateQuestionConfigBody (required):
-  Future<Response> updateQuestionConfigWithHttpInfo(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody,) async {
+  Future<Response> updateQuestionConfigWithHttpInfo(ApiUpdateQuestionConfigRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateQuestionConfigBody = request.updateQuestionConfigBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -6801,8 +7157,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionConfigBody] updateQuestionConfigBody (required):
-  Future<APIEmptyResponse?> updateQuestionConfig(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody,) async {
-    final response = await updateQuestionConfigWithHttpInfo(tenantId, id, updateQuestionConfigBody,);
+  Future<APIEmptyResponse?> updateQuestionConfig(ApiUpdateQuestionConfigRequest request,) async {
+    final response = await updateQuestionConfigWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6824,7 +7180,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionResultBody] updateQuestionResultBody (required):
-  Future<Response> updateQuestionResultWithHttpInfo(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody,) async {
+  Future<Response> updateQuestionResultWithHttpInfo(ApiUpdateQuestionResultRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateQuestionResultBody = request.updateQuestionResultBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -6859,8 +7218,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionResultBody] updateQuestionResultBody (required):
-  Future<APIEmptyResponse?> updateQuestionResult(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody,) async {
-    final response = await updateQuestionResultWithHttpInfo(tenantId, id, updateQuestionResultBody,);
+  Future<APIEmptyResponse?> updateQuestionResult(ApiUpdateQuestionResultRequest request,) async {
+    final response = await updateQuestionResultWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6884,7 +7243,11 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<Response> updateSubscriptionWithHttpInfo(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, { String? userId, }) async {
+  Future<Response> updateSubscriptionWithHttpInfo(ApiUpdateSubscriptionRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateAPIUserSubscriptionData = request.updateAPIUserSubscriptionData;
+    final userId = request.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -6924,8 +7287,8 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<UpdateSubscriptionAPIResponse?> updateSubscription(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, { String? userId, }) async {
-    final response = await updateSubscriptionWithHttpInfo(tenantId, id, updateAPIUserSubscriptionData,  userId: userId, );
+  Future<UpdateSubscriptionAPIResponse?> updateSubscription(ApiUpdateSubscriptionRequest request,) async {
+    final response = await updateSubscriptionWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6947,7 +7310,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantBody] updateTenantBody (required):
-  Future<Response> updateTenantWithHttpInfo(String tenantId, String id, UpdateTenantBody updateTenantBody,) async {
+  Future<Response> updateTenantWithHttpInfo(ApiUpdateTenantRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateTenantBody = request.updateTenantBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -6982,8 +7348,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantBody] updateTenantBody (required):
-  Future<APIEmptyResponse?> updateTenant(String tenantId, String id, UpdateTenantBody updateTenantBody,) async {
-    final response = await updateTenantWithHttpInfo(tenantId, id, updateTenantBody,);
+  Future<APIEmptyResponse?> updateTenant(ApiUpdateTenantRequest request,) async {
+    final response = await updateTenantWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7005,7 +7371,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantPackageBody] updateTenantPackageBody (required):
-  Future<Response> updateTenantPackageWithHttpInfo(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody,) async {
+  Future<Response> updateTenantPackageWithHttpInfo(ApiUpdateTenantPackageRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateTenantPackageBody = request.updateTenantPackageBody;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -7040,8 +7409,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantPackageBody] updateTenantPackageBody (required):
-  Future<APIEmptyResponse?> updateTenantPackage(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody,) async {
-    final response = await updateTenantPackageWithHttpInfo(tenantId, id, updateTenantPackageBody,);
+  Future<APIEmptyResponse?> updateTenantPackage(ApiUpdateTenantPackageRequest request,) async {
+    final response = await updateTenantPackageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7065,7 +7434,11 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> updateTenantUserWithHttpInfo(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, { String? updateComments, }) async {
+  Future<Response> updateTenantUserWithHttpInfo(ApiUpdateTenantUserRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateTenantUserBody = request.updateTenantUserBody;
+    final updateComments = request.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -7105,8 +7478,8 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> updateTenantUser(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, { String? updateComments, }) async {
-    final response = await updateTenantUserWithHttpInfo(tenantId, id, updateTenantUserBody,  updateComments: updateComments, );
+  Future<APIEmptyResponse?> updateTenantUser(ApiUpdateTenantUserRequest request,) async {
+    final response = await updateTenantUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7128,7 +7501,10 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateUserBadgeParams] updateUserBadgeParams (required):
-  Future<Response> updateUserBadgeWithHttpInfo(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams,) async {
+  Future<Response> updateUserBadgeWithHttpInfo(ApiUpdateUserBadgeRequest request,) async {
+    final tenantId = request.tenantId;
+    final id = request.id;
+    final updateUserBadgeParams = request.updateUserBadgeParams;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -7163,8 +7539,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateUserBadgeParams] updateUserBadgeParams (required):
-  Future<APIEmptySuccessResponse?> updateUserBadge(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams,) async {
-    final response = await updateUserBadgeWithHttpInfo(tenantId, id, updateUserBadgeParams,);
+  Future<APIEmptySuccessResponse?> updateUserBadge(ApiUpdateUserBadgeRequest request,) async {
+    final response = await updateUserBadgeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7178,3 +7554,1439 @@ class DefaultApi {
     return null;
   }
 }
+
+/// Request parameters for [DefaultApi.addDomainConfig].
+class ApiAddDomainConfigRequest {
+  const ApiAddDomainConfigRequest({
+    required this.tenantId,
+    required this.addDomainConfigParams,
+  });
+  final String tenantId;
+  final AddDomainConfigParams addDomainConfigParams;
+}
+
+/// Request parameters for [DefaultApi.addHashTag].
+class ApiAddHashTagRequest {
+  const ApiAddHashTagRequest({
+    this.tenantId,
+    this.createHashTagBody,
+  });
+  final String? tenantId;
+  final CreateHashTagBody? createHashTagBody;
+}
+
+/// Request parameters for [DefaultApi.addHashTagsBulk].
+class ApiAddHashTagsBulkRequest {
+  const ApiAddHashTagsBulkRequest({
+    this.tenantId,
+    this.bulkCreateHashTagsBody,
+  });
+  final String? tenantId;
+  final BulkCreateHashTagsBody? bulkCreateHashTagsBody;
+}
+
+/// Request parameters for [DefaultApi.addPage].
+class ApiAddPageRequest {
+  const ApiAddPageRequest({
+    required this.tenantId,
+    required this.createAPIPageData,
+  });
+  final String tenantId;
+  final CreateAPIPageData createAPIPageData;
+}
+
+/// Request parameters for [DefaultApi.addSSOUser].
+class ApiAddSSOUserRequest {
+  const ApiAddSSOUserRequest({
+    required this.tenantId,
+    required this.createAPISSOUserData,
+  });
+  final String tenantId;
+  final CreateAPISSOUserData createAPISSOUserData;
+}
+
+/// Request parameters for [DefaultApi.aggregate].
+class ApiAggregateRequest {
+  const ApiAggregateRequest({
+    required this.tenantId,
+    required this.aggregationRequest,
+    this.parentTenantId,
+    this.includeStats,
+  });
+  final String tenantId;
+  final AggregationRequest aggregationRequest;
+  final String? parentTenantId;
+  final bool? includeStats;
+}
+
+/// Request parameters for [DefaultApi.aggregateQuestionResults].
+class ApiAggregateQuestionResultsRequest {
+  const ApiAggregateQuestionResultsRequest({
+    required this.tenantId,
+    this.questionId,
+    this.questionIds,
+    this.urlId,
+    this.timeBucket,
+    this.startDate,
+    this.forceRecalculate,
+  });
+  final String tenantId;
+  final String? questionId;
+  final List<String>? questionIds;
+  final String? urlId;
+  final AggregateTimeBucket? timeBucket;
+  final DateTime? startDate;
+  final bool? forceRecalculate;
+}
+
+/// Request parameters for [DefaultApi.blockUserFromComment].
+class ApiBlockUserFromCommentRequest {
+  const ApiBlockUserFromCommentRequest({
+    required this.tenantId,
+    required this.id,
+    required this.blockFromCommentParams,
+    this.userId,
+    this.anonUserId,
+  });
+  final String tenantId;
+  final String id;
+  final BlockFromCommentParams blockFromCommentParams;
+  final String? userId;
+  final String? anonUserId;
+}
+
+/// Request parameters for [DefaultApi.bulkAggregateQuestionResults].
+class ApiBulkAggregateQuestionResultsRequest {
+  const ApiBulkAggregateQuestionResultsRequest({
+    required this.tenantId,
+    required this.bulkAggregateQuestionResultsRequest,
+    this.forceRecalculate,
+  });
+  final String tenantId;
+  final BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest;
+  final bool? forceRecalculate;
+}
+
+/// Request parameters for [DefaultApi.changeTicketState].
+class ApiChangeTicketStateRequest {
+  const ApiChangeTicketStateRequest({
+    required this.tenantId,
+    required this.userId,
+    required this.id,
+    required this.changeTicketStateBody,
+  });
+  final String tenantId;
+  final String userId;
+  final String id;
+  final ChangeTicketStateBody changeTicketStateBody;
+}
+
+/// Request parameters for [DefaultApi.combineCommentsWithQuestionResults].
+class ApiCombineCommentsWithQuestionResultsRequest {
+  const ApiCombineCommentsWithQuestionResultsRequest({
+    required this.tenantId,
+    this.questionId,
+    this.questionIds,
+    this.urlId,
+    this.startDate,
+    this.forceRecalculate,
+    this.minValue,
+    this.maxValue,
+    this.limit,
+  });
+  final String tenantId;
+  final String? questionId;
+  final List<String>? questionIds;
+  final String? urlId;
+  final DateTime? startDate;
+  final bool? forceRecalculate;
+  final double? minValue;
+  final double? maxValue;
+  final double? limit;
+}
+
+/// Request parameters for [DefaultApi.createEmailTemplate].
+class ApiCreateEmailTemplateRequest {
+  const ApiCreateEmailTemplateRequest({
+    required this.tenantId,
+    required this.createEmailTemplateBody,
+  });
+  final String tenantId;
+  final CreateEmailTemplateBody createEmailTemplateBody;
+}
+
+/// Request parameters for [DefaultApi.createFeedPost].
+class ApiCreateFeedPostRequest {
+  const ApiCreateFeedPostRequest({
+    required this.tenantId,
+    required this.createFeedPostParams,
+    this.broadcastId,
+    this.isLive,
+    this.doSpamCheck,
+    this.skipDupCheck,
+  });
+  final String tenantId;
+  final CreateFeedPostParams createFeedPostParams;
+  final String? broadcastId;
+  final bool? isLive;
+  final bool? doSpamCheck;
+  final bool? skipDupCheck;
+}
+
+/// Request parameters for [DefaultApi.createModerator].
+class ApiCreateModeratorRequest {
+  const ApiCreateModeratorRequest({
+    required this.tenantId,
+    required this.createModeratorBody,
+  });
+  final String tenantId;
+  final CreateModeratorBody createModeratorBody;
+}
+
+/// Request parameters for [DefaultApi.createQuestionConfig].
+class ApiCreateQuestionConfigRequest {
+  const ApiCreateQuestionConfigRequest({
+    required this.tenantId,
+    required this.createQuestionConfigBody,
+  });
+  final String tenantId;
+  final CreateQuestionConfigBody createQuestionConfigBody;
+}
+
+/// Request parameters for [DefaultApi.createQuestionResult].
+class ApiCreateQuestionResultRequest {
+  const ApiCreateQuestionResultRequest({
+    required this.tenantId,
+    required this.createQuestionResultBody,
+  });
+  final String tenantId;
+  final CreateQuestionResultBody createQuestionResultBody;
+}
+
+/// Request parameters for [DefaultApi.createSubscription].
+class ApiCreateSubscriptionRequest {
+  const ApiCreateSubscriptionRequest({
+    required this.tenantId,
+    required this.createAPIUserSubscriptionData,
+  });
+  final String tenantId;
+  final CreateAPIUserSubscriptionData createAPIUserSubscriptionData;
+}
+
+/// Request parameters for [DefaultApi.createTenant].
+class ApiCreateTenantRequest {
+  const ApiCreateTenantRequest({
+    required this.tenantId,
+    required this.createTenantBody,
+  });
+  final String tenantId;
+  final CreateTenantBody createTenantBody;
+}
+
+/// Request parameters for [DefaultApi.createTenantPackage].
+class ApiCreateTenantPackageRequest {
+  const ApiCreateTenantPackageRequest({
+    required this.tenantId,
+    required this.createTenantPackageBody,
+  });
+  final String tenantId;
+  final CreateTenantPackageBody createTenantPackageBody;
+}
+
+/// Request parameters for [DefaultApi.createTenantUser].
+class ApiCreateTenantUserRequest {
+  const ApiCreateTenantUserRequest({
+    required this.tenantId,
+    required this.createTenantUserBody,
+  });
+  final String tenantId;
+  final CreateTenantUserBody createTenantUserBody;
+}
+
+/// Request parameters for [DefaultApi.createTicket].
+class ApiCreateTicketRequest {
+  const ApiCreateTicketRequest({
+    required this.tenantId,
+    required this.userId,
+    required this.createTicketBody,
+  });
+  final String tenantId;
+  final String userId;
+  final CreateTicketBody createTicketBody;
+}
+
+/// Request parameters for [DefaultApi.createUserBadge].
+class ApiCreateUserBadgeRequest {
+  const ApiCreateUserBadgeRequest({
+    required this.tenantId,
+    required this.createUserBadgeParams,
+  });
+  final String tenantId;
+  final CreateUserBadgeParams createUserBadgeParams;
+}
+
+/// Request parameters for [DefaultApi.createVote].
+class ApiCreateVoteRequest {
+  const ApiCreateVoteRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.direction,
+    this.userId,
+    this.anonUserId,
+  });
+  final String tenantId;
+  final String commentId;
+  final String direction;
+  final String? userId;
+  final String? anonUserId;
+}
+
+/// Request parameters for [DefaultApi.deleteComment].
+class ApiDeleteCommentRequest {
+  const ApiDeleteCommentRequest({
+    required this.tenantId,
+    required this.id,
+    this.contextUserId,
+    this.isLive,
+  });
+  final String tenantId;
+  final String id;
+  final String? contextUserId;
+  final bool? isLive;
+}
+
+/// Request parameters for [DefaultApi.deleteDomainConfig].
+class ApiDeleteDomainConfigRequest {
+  const ApiDeleteDomainConfigRequest({
+    required this.tenantId,
+    required this.domain,
+  });
+  final String tenantId;
+  final String domain;
+}
+
+/// Request parameters for [DefaultApi.deleteEmailTemplate].
+class ApiDeleteEmailTemplateRequest {
+  const ApiDeleteEmailTemplateRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deleteEmailTemplateRenderError].
+class ApiDeleteEmailTemplateRenderErrorRequest {
+  const ApiDeleteEmailTemplateRenderErrorRequest({
+    required this.tenantId,
+    required this.id,
+    required this.errorId,
+  });
+  final String tenantId;
+  final String id;
+  final String errorId;
+}
+
+/// Request parameters for [DefaultApi.deleteHashTag].
+class ApiDeleteHashTagRequest {
+  const ApiDeleteHashTagRequest({
+    required this.tag,
+    this.tenantId,
+    this.deleteHashTagRequestBody,
+  });
+  final String tag;
+  final String? tenantId;
+  final DeleteHashTagRequestBody? deleteHashTagRequestBody;
+}
+
+/// Request parameters for [DefaultApi.deleteModerator].
+class ApiDeleteModeratorRequest {
+  const ApiDeleteModeratorRequest({
+    required this.tenantId,
+    required this.id,
+    this.sendEmail,
+  });
+  final String tenantId;
+  final String id;
+  final String? sendEmail;
+}
+
+/// Request parameters for [DefaultApi.deleteNotificationCount].
+class ApiDeleteNotificationCountRequest {
+  const ApiDeleteNotificationCountRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deletePage].
+class ApiDeletePageRequest {
+  const ApiDeletePageRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deletePendingWebhookEvent].
+class ApiDeletePendingWebhookEventRequest {
+  const ApiDeletePendingWebhookEventRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deleteQuestionConfig].
+class ApiDeleteQuestionConfigRequest {
+  const ApiDeleteQuestionConfigRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deleteQuestionResult].
+class ApiDeleteQuestionResultRequest {
+  const ApiDeleteQuestionResultRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deleteSSOUser].
+class ApiDeleteSSOUserRequest {
+  const ApiDeleteSSOUserRequest({
+    required this.tenantId,
+    required this.id,
+    this.deleteComments,
+    this.commentDeleteMode,
+  });
+  final String tenantId;
+  final String id;
+  final bool? deleteComments;
+  final String? commentDeleteMode;
+}
+
+/// Request parameters for [DefaultApi.deleteSubscription].
+class ApiDeleteSubscriptionRequest {
+  const ApiDeleteSubscriptionRequest({
+    required this.tenantId,
+    required this.id,
+    this.userId,
+  });
+  final String tenantId;
+  final String id;
+  final String? userId;
+}
+
+/// Request parameters for [DefaultApi.deleteTenant].
+class ApiDeleteTenantRequest {
+  const ApiDeleteTenantRequest({
+    required this.tenantId,
+    required this.id,
+    this.sure,
+  });
+  final String tenantId;
+  final String id;
+  final String? sure;
+}
+
+/// Request parameters for [DefaultApi.deleteTenantPackage].
+class ApiDeleteTenantPackageRequest {
+  const ApiDeleteTenantPackageRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deleteTenantUser].
+class ApiDeleteTenantUserRequest {
+  const ApiDeleteTenantUserRequest({
+    required this.tenantId,
+    required this.id,
+    this.deleteComments,
+    this.commentDeleteMode,
+  });
+  final String tenantId;
+  final String id;
+  final String? deleteComments;
+  final String? commentDeleteMode;
+}
+
+/// Request parameters for [DefaultApi.deleteUserBadge].
+class ApiDeleteUserBadgeRequest {
+  const ApiDeleteUserBadgeRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.deleteVote].
+class ApiDeleteVoteRequest {
+  const ApiDeleteVoteRequest({
+    required this.tenantId,
+    required this.id,
+    this.editKey,
+  });
+  final String tenantId;
+  final String id;
+  final String? editKey;
+}
+
+/// Request parameters for [DefaultApi.flagComment].
+class ApiFlagCommentRequest {
+  const ApiFlagCommentRequest({
+    required this.tenantId,
+    required this.id,
+    this.userId,
+    this.anonUserId,
+  });
+  final String tenantId;
+  final String id;
+  final String? userId;
+  final String? anonUserId;
+}
+
+/// Request parameters for [DefaultApi.getAuditLogs].
+class ApiGetAuditLogsRequest {
+  const ApiGetAuditLogsRequest({
+    required this.tenantId,
+    this.limit,
+    this.skip,
+    this.order,
+    this.after,
+    this.before,
+  });
+  final String tenantId;
+  final double? limit;
+  final double? skip;
+  final SORTDIR? order;
+  final double? after;
+  final double? before;
+}
+
+/// Request parameters for [DefaultApi.getCachedNotificationCount].
+class ApiGetCachedNotificationCountRequest {
+  const ApiGetCachedNotificationCountRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getComment].
+class ApiGetCommentRequest {
+  const ApiGetCommentRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getComments].
+class ApiGetCommentsRequest {
+  const ApiGetCommentsRequest({
+    required this.tenantId,
+    this.page,
+    this.limit,
+    this.skip,
+    this.asTree,
+    this.skipChildren,
+    this.limitChildren,
+    this.maxTreeDepth,
+    this.urlId,
+    this.userId,
+    this.anonUserId,
+    this.contextUserId,
+    this.hashTag,
+    this.parentId,
+    this.direction,
+    this.fromDate,
+    this.toDate,
+  });
+  final String tenantId;
+  final int? page;
+  final int? limit;
+  final int? skip;
+  final bool? asTree;
+  final int? skipChildren;
+  final int? limitChildren;
+  final int? maxTreeDepth;
+  final String? urlId;
+  final String? userId;
+  final String? anonUserId;
+  final String? contextUserId;
+  final String? hashTag;
+  final String? parentId;
+  final SortDirections? direction;
+  final int? fromDate;
+  final int? toDate;
+}
+
+/// Request parameters for [DefaultApi.getDomainConfig].
+class ApiGetDomainConfigRequest {
+  const ApiGetDomainConfigRequest({
+    required this.tenantId,
+    required this.domain,
+  });
+  final String tenantId;
+  final String domain;
+}
+
+/// Request parameters for [DefaultApi.getDomainConfigs].
+class ApiGetDomainConfigsRequest {
+  const ApiGetDomainConfigsRequest({
+    required this.tenantId,
+  });
+  final String tenantId;
+}
+
+/// Request parameters for [DefaultApi.getEmailTemplate].
+class ApiGetEmailTemplateRequest {
+  const ApiGetEmailTemplateRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getEmailTemplateDefinitions].
+class ApiGetEmailTemplateDefinitionsRequest {
+  const ApiGetEmailTemplateDefinitionsRequest({
+    required this.tenantId,
+  });
+  final String tenantId;
+}
+
+/// Request parameters for [DefaultApi.getEmailTemplateRenderErrors].
+class ApiGetEmailTemplateRenderErrorsRequest {
+  const ApiGetEmailTemplateRenderErrorsRequest({
+    required this.tenantId,
+    required this.id,
+    this.skip,
+  });
+  final String tenantId;
+  final String id;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getEmailTemplates].
+class ApiGetEmailTemplatesRequest {
+  const ApiGetEmailTemplatesRequest({
+    required this.tenantId,
+    this.skip,
+  });
+  final String tenantId;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getFeedPosts].
+class ApiGetFeedPostsRequest {
+  const ApiGetFeedPostsRequest({
+    required this.tenantId,
+    this.afterId,
+    this.limit,
+    this.tags,
+  });
+  final String tenantId;
+  final String? afterId;
+  final int? limit;
+  final List<String>? tags;
+}
+
+/// Request parameters for [DefaultApi.getHashTags].
+class ApiGetHashTagsRequest {
+  const ApiGetHashTagsRequest({
+    required this.tenantId,
+    this.page,
+  });
+  final String tenantId;
+  final double? page;
+}
+
+/// Request parameters for [DefaultApi.getModerator].
+class ApiGetModeratorRequest {
+  const ApiGetModeratorRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getModerators].
+class ApiGetModeratorsRequest {
+  const ApiGetModeratorsRequest({
+    required this.tenantId,
+    this.skip,
+  });
+  final String tenantId;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getNotificationCount].
+class ApiGetNotificationCountRequest {
+  const ApiGetNotificationCountRequest({
+    required this.tenantId,
+    this.userId,
+    this.urlId,
+    this.fromCommentId,
+    this.viewed,
+    this.type,
+  });
+  final String tenantId;
+  final String? userId;
+  final String? urlId;
+  final String? fromCommentId;
+  final bool? viewed;
+  final String? type;
+}
+
+/// Request parameters for [DefaultApi.getNotifications].
+class ApiGetNotificationsRequest {
+  const ApiGetNotificationsRequest({
+    required this.tenantId,
+    this.userId,
+    this.urlId,
+    this.fromCommentId,
+    this.viewed,
+    this.type,
+    this.skip,
+  });
+  final String tenantId;
+  final String? userId;
+  final String? urlId;
+  final String? fromCommentId;
+  final bool? viewed;
+  final String? type;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getPageByURLId].
+class ApiGetPageByURLIdRequest {
+  const ApiGetPageByURLIdRequest({
+    required this.tenantId,
+    required this.urlId,
+  });
+  final String tenantId;
+  final String urlId;
+}
+
+/// Request parameters for [DefaultApi.getPages].
+class ApiGetPagesRequest {
+  const ApiGetPagesRequest({
+    required this.tenantId,
+  });
+  final String tenantId;
+}
+
+/// Request parameters for [DefaultApi.getPendingWebhookEventCount].
+class ApiGetPendingWebhookEventCountRequest {
+  const ApiGetPendingWebhookEventCountRequest({
+    required this.tenantId,
+    this.commentId,
+    this.externalId,
+    this.eventType,
+    this.type,
+    this.domain,
+    this.attemptCountGT,
+  });
+  final String tenantId;
+  final String? commentId;
+  final String? externalId;
+  final String? eventType;
+  final String? type;
+  final String? domain;
+  final double? attemptCountGT;
+}
+
+/// Request parameters for [DefaultApi.getPendingWebhookEvents].
+class ApiGetPendingWebhookEventsRequest {
+  const ApiGetPendingWebhookEventsRequest({
+    required this.tenantId,
+    this.commentId,
+    this.externalId,
+    this.eventType,
+    this.type,
+    this.domain,
+    this.attemptCountGT,
+    this.skip,
+  });
+  final String tenantId;
+  final String? commentId;
+  final String? externalId;
+  final String? eventType;
+  final String? type;
+  final String? domain;
+  final double? attemptCountGT;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getQuestionConfig].
+class ApiGetQuestionConfigRequest {
+  const ApiGetQuestionConfigRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getQuestionConfigs].
+class ApiGetQuestionConfigsRequest {
+  const ApiGetQuestionConfigsRequest({
+    required this.tenantId,
+    this.skip,
+  });
+  final String tenantId;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getQuestionResult].
+class ApiGetQuestionResultRequest {
+  const ApiGetQuestionResultRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getQuestionResults].
+class ApiGetQuestionResultsRequest {
+  const ApiGetQuestionResultsRequest({
+    required this.tenantId,
+    this.urlId,
+    this.userId,
+    this.startDate,
+    this.questionId,
+    this.questionIds,
+    this.skip,
+  });
+  final String tenantId;
+  final String? urlId;
+  final String? userId;
+  final String? startDate;
+  final String? questionId;
+  final String? questionIds;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getSSOUserByEmail].
+class ApiGetSSOUserByEmailRequest {
+  const ApiGetSSOUserByEmailRequest({
+    required this.tenantId,
+    required this.email,
+  });
+  final String tenantId;
+  final String email;
+}
+
+/// Request parameters for [DefaultApi.getSSOUserById].
+class ApiGetSSOUserByIdRequest {
+  const ApiGetSSOUserByIdRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getSSOUsers].
+class ApiGetSSOUsersRequest {
+  const ApiGetSSOUsersRequest({
+    required this.tenantId,
+    this.skip,
+  });
+  final String tenantId;
+  final int? skip;
+}
+
+/// Request parameters for [DefaultApi.getSubscriptions].
+class ApiGetSubscriptionsRequest {
+  const ApiGetSubscriptionsRequest({
+    required this.tenantId,
+    this.userId,
+  });
+  final String tenantId;
+  final String? userId;
+}
+
+/// Request parameters for [DefaultApi.getTenant].
+class ApiGetTenantRequest {
+  const ApiGetTenantRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getTenantDailyUsages].
+class ApiGetTenantDailyUsagesRequest {
+  const ApiGetTenantDailyUsagesRequest({
+    required this.tenantId,
+    this.yearNumber,
+    this.monthNumber,
+    this.dayNumber,
+    this.skip,
+  });
+  final String tenantId;
+  final double? yearNumber;
+  final double? monthNumber;
+  final double? dayNumber;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getTenantPackage].
+class ApiGetTenantPackageRequest {
+  const ApiGetTenantPackageRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getTenantPackages].
+class ApiGetTenantPackagesRequest {
+  const ApiGetTenantPackagesRequest({
+    required this.tenantId,
+    this.skip,
+  });
+  final String tenantId;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getTenantUser].
+class ApiGetTenantUserRequest {
+  const ApiGetTenantUserRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getTenantUsers].
+class ApiGetTenantUsersRequest {
+  const ApiGetTenantUsersRequest({
+    required this.tenantId,
+    this.skip,
+  });
+  final String tenantId;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getTenants].
+class ApiGetTenantsRequest {
+  const ApiGetTenantsRequest({
+    required this.tenantId,
+    this.meta,
+    this.skip,
+  });
+  final String tenantId;
+  final String? meta;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getTicket].
+class ApiGetTicketRequest {
+  const ApiGetTicketRequest({
+    required this.tenantId,
+    required this.id,
+    this.userId,
+  });
+  final String tenantId;
+  final String id;
+  final String? userId;
+}
+
+/// Request parameters for [DefaultApi.getTickets].
+class ApiGetTicketsRequest {
+  const ApiGetTicketsRequest({
+    required this.tenantId,
+    this.userId,
+    this.state,
+    this.skip,
+    this.limit,
+  });
+  final String tenantId;
+  final String? userId;
+  final double? state;
+  final double? skip;
+  final double? limit;
+}
+
+/// Request parameters for [DefaultApi.getUser].
+class ApiGetUserRequest {
+  const ApiGetUserRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getUserBadge].
+class ApiGetUserBadgeRequest {
+  const ApiGetUserBadgeRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getUserBadgeProgressById].
+class ApiGetUserBadgeProgressByIdRequest {
+  const ApiGetUserBadgeProgressByIdRequest({
+    required this.tenantId,
+    required this.id,
+  });
+  final String tenantId;
+  final String id;
+}
+
+/// Request parameters for [DefaultApi.getUserBadgeProgressByUserId].
+class ApiGetUserBadgeProgressByUserIdRequest {
+  const ApiGetUserBadgeProgressByUserIdRequest({
+    required this.tenantId,
+    required this.userId,
+  });
+  final String tenantId;
+  final String userId;
+}
+
+/// Request parameters for [DefaultApi.getUserBadgeProgressList].
+class ApiGetUserBadgeProgressListRequest {
+  const ApiGetUserBadgeProgressListRequest({
+    required this.tenantId,
+    this.userId,
+    this.limit,
+    this.skip,
+  });
+  final String tenantId;
+  final String? userId;
+  final double? limit;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getUserBadges].
+class ApiGetUserBadgesRequest {
+  const ApiGetUserBadgesRequest({
+    required this.tenantId,
+    this.userId,
+    this.badgeId,
+    this.type,
+    this.displayedOnComments,
+    this.limit,
+    this.skip,
+  });
+  final String tenantId;
+  final String? userId;
+  final String? badgeId;
+  final double? type;
+  final bool? displayedOnComments;
+  final double? limit;
+  final double? skip;
+}
+
+/// Request parameters for [DefaultApi.getVotes].
+class ApiGetVotesRequest {
+  const ApiGetVotesRequest({
+    required this.tenantId,
+    required this.urlId,
+  });
+  final String tenantId;
+  final String urlId;
+}
+
+/// Request parameters for [DefaultApi.getVotesForUser].
+class ApiGetVotesForUserRequest {
+  const ApiGetVotesForUserRequest({
+    required this.tenantId,
+    required this.urlId,
+    this.userId,
+    this.anonUserId,
+  });
+  final String tenantId;
+  final String urlId;
+  final String? userId;
+  final String? anonUserId;
+}
+
+/// Request parameters for [DefaultApi.patchDomainConfig].
+class ApiPatchDomainConfigRequest {
+  const ApiPatchDomainConfigRequest({
+    required this.tenantId,
+    required this.domainToUpdate,
+    required this.patchDomainConfigParams,
+  });
+  final String tenantId;
+  final String domainToUpdate;
+  final PatchDomainConfigParams patchDomainConfigParams;
+}
+
+/// Request parameters for [DefaultApi.patchHashTag].
+class ApiPatchHashTagRequest {
+  const ApiPatchHashTagRequest({
+    required this.tag,
+    this.tenantId,
+    this.updateHashTagBody,
+  });
+  final String tag;
+  final String? tenantId;
+  final UpdateHashTagBody? updateHashTagBody;
+}
+
+/// Request parameters for [DefaultApi.patchPage].
+class ApiPatchPageRequest {
+  const ApiPatchPageRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateAPIPageData,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateAPIPageData updateAPIPageData;
+}
+
+/// Request parameters for [DefaultApi.patchSSOUser].
+class ApiPatchSSOUserRequest {
+  const ApiPatchSSOUserRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateAPISSOUserData,
+    this.updateComments,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateAPISSOUserData updateAPISSOUserData;
+  final bool? updateComments;
+}
+
+/// Request parameters for [DefaultApi.putDomainConfig].
+class ApiPutDomainConfigRequest {
+  const ApiPutDomainConfigRequest({
+    required this.tenantId,
+    required this.domainToUpdate,
+    required this.updateDomainConfigParams,
+  });
+  final String tenantId;
+  final String domainToUpdate;
+  final UpdateDomainConfigParams updateDomainConfigParams;
+}
+
+/// Request parameters for [DefaultApi.putSSOUser].
+class ApiPutSSOUserRequest {
+  const ApiPutSSOUserRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateAPISSOUserData,
+    this.updateComments,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateAPISSOUserData updateAPISSOUserData;
+  final bool? updateComments;
+}
+
+/// Request parameters for [DefaultApi.renderEmailTemplate].
+class ApiRenderEmailTemplateRequest {
+  const ApiRenderEmailTemplateRequest({
+    required this.tenantId,
+    required this.renderEmailTemplateBody,
+    this.locale,
+  });
+  final String tenantId;
+  final RenderEmailTemplateBody renderEmailTemplateBody;
+  final String? locale;
+}
+
+/// Request parameters for [DefaultApi.replaceTenantPackage].
+class ApiReplaceTenantPackageRequest {
+  const ApiReplaceTenantPackageRequest({
+    required this.tenantId,
+    required this.id,
+    required this.replaceTenantPackageBody,
+  });
+  final String tenantId;
+  final String id;
+  final ReplaceTenantPackageBody replaceTenantPackageBody;
+}
+
+/// Request parameters for [DefaultApi.replaceTenantUser].
+class ApiReplaceTenantUserRequest {
+  const ApiReplaceTenantUserRequest({
+    required this.tenantId,
+    required this.id,
+    required this.replaceTenantUserBody,
+    this.updateComments,
+  });
+  final String tenantId;
+  final String id;
+  final ReplaceTenantUserBody replaceTenantUserBody;
+  final String? updateComments;
+}
+
+/// Request parameters for [DefaultApi.saveComment].
+class ApiSaveCommentRequest {
+  const ApiSaveCommentRequest({
+    required this.tenantId,
+    required this.createCommentParams,
+    this.isLive,
+    this.doSpamCheck,
+    this.sendEmails,
+    this.populateNotifications,
+  });
+  final String tenantId;
+  final CreateCommentParams createCommentParams;
+  final bool? isLive;
+  final bool? doSpamCheck;
+  final bool? sendEmails;
+  final bool? populateNotifications;
+}
+
+/// Request parameters for [DefaultApi.saveCommentsBulk].
+class ApiSaveCommentsBulkRequest {
+  const ApiSaveCommentsBulkRequest({
+    required this.tenantId,
+    required this.createCommentParams,
+    this.isLive,
+    this.doSpamCheck,
+    this.sendEmails,
+    this.populateNotifications,
+  });
+  final String tenantId;
+  final List<CreateCommentParams> createCommentParams;
+  final bool? isLive;
+  final bool? doSpamCheck;
+  final bool? sendEmails;
+  final bool? populateNotifications;
+}
+
+/// Request parameters for [DefaultApi.sendInvite].
+class ApiSendInviteRequest {
+  const ApiSendInviteRequest({
+    required this.tenantId,
+    required this.id,
+    required this.fromName,
+  });
+  final String tenantId;
+  final String id;
+  final String fromName;
+}
+
+/// Request parameters for [DefaultApi.sendLoginLink].
+class ApiSendLoginLinkRequest {
+  const ApiSendLoginLinkRequest({
+    required this.tenantId,
+    required this.id,
+    this.redirectURL,
+  });
+  final String tenantId;
+  final String id;
+  final String? redirectURL;
+}
+
+/// Request parameters for [DefaultApi.unBlockUserFromComment].
+class ApiUnBlockUserFromCommentRequest {
+  const ApiUnBlockUserFromCommentRequest({
+    required this.tenantId,
+    required this.id,
+    required this.unBlockFromCommentParams,
+    this.userId,
+    this.anonUserId,
+  });
+  final String tenantId;
+  final String id;
+  final UnBlockFromCommentParams unBlockFromCommentParams;
+  final String? userId;
+  final String? anonUserId;
+}
+
+/// Request parameters for [DefaultApi.unFlagComment].
+class ApiUnFlagCommentRequest {
+  const ApiUnFlagCommentRequest({
+    required this.tenantId,
+    required this.id,
+    this.userId,
+    this.anonUserId,
+  });
+  final String tenantId;
+  final String id;
+  final String? userId;
+  final String? anonUserId;
+}
+
+/// Request parameters for [DefaultApi.updateComment].
+class ApiUpdateCommentRequest {
+  const ApiUpdateCommentRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updatableCommentParams,
+    this.contextUserId,
+    this.doSpamCheck,
+    this.isLive,
+  });
+  final String tenantId;
+  final String id;
+  final UpdatableCommentParams updatableCommentParams;
+  final String? contextUserId;
+  final bool? doSpamCheck;
+  final bool? isLive;
+}
+
+/// Request parameters for [DefaultApi.updateEmailTemplate].
+class ApiUpdateEmailTemplateRequest {
+  const ApiUpdateEmailTemplateRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateEmailTemplateBody,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateEmailTemplateBody updateEmailTemplateBody;
+}
+
+/// Request parameters for [DefaultApi.updateFeedPost].
+class ApiUpdateFeedPostRequest {
+  const ApiUpdateFeedPostRequest({
+    required this.tenantId,
+    required this.id,
+    required this.feedPost,
+  });
+  final String tenantId;
+  final String id;
+  final FeedPost feedPost;
+}
+
+/// Request parameters for [DefaultApi.updateModerator].
+class ApiUpdateModeratorRequest {
+  const ApiUpdateModeratorRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateModeratorBody,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateModeratorBody updateModeratorBody;
+}
+
+/// Request parameters for [DefaultApi.updateNotification].
+class ApiUpdateNotificationRequest {
+  const ApiUpdateNotificationRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateNotificationBody,
+    this.userId,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateNotificationBody updateNotificationBody;
+  final String? userId;
+}
+
+/// Request parameters for [DefaultApi.updateQuestionConfig].
+class ApiUpdateQuestionConfigRequest {
+  const ApiUpdateQuestionConfigRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateQuestionConfigBody,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateQuestionConfigBody updateQuestionConfigBody;
+}
+
+/// Request parameters for [DefaultApi.updateQuestionResult].
+class ApiUpdateQuestionResultRequest {
+  const ApiUpdateQuestionResultRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateQuestionResultBody,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateQuestionResultBody updateQuestionResultBody;
+}
+
+/// Request parameters for [DefaultApi.updateSubscription].
+class ApiUpdateSubscriptionRequest {
+  const ApiUpdateSubscriptionRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateAPIUserSubscriptionData,
+    this.userId,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData;
+  final String? userId;
+}
+
+/// Request parameters for [DefaultApi.updateTenant].
+class ApiUpdateTenantRequest {
+  const ApiUpdateTenantRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateTenantBody,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateTenantBody updateTenantBody;
+}
+
+/// Request parameters for [DefaultApi.updateTenantPackage].
+class ApiUpdateTenantPackageRequest {
+  const ApiUpdateTenantPackageRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateTenantPackageBody,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateTenantPackageBody updateTenantPackageBody;
+}
+
+/// Request parameters for [DefaultApi.updateTenantUser].
+class ApiUpdateTenantUserRequest {
+  const ApiUpdateTenantUserRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateTenantUserBody,
+    this.updateComments,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateTenantUserBody updateTenantUserBody;
+  final String? updateComments;
+}
+
+/// Request parameters for [DefaultApi.updateUserBadge].
+class ApiUpdateUserBadgeRequest {
+  const ApiUpdateUserBadgeRequest({
+    required this.tenantId,
+    required this.id,
+    required this.updateUserBadgeParams,
+  });
+  final String tenantId;
+  final String id;
+  final UpdateUserBadgeParams updateUserBadgeParams;
+}
diff --git a/client/lib/api/moderation_api.dart b/client/lib/api/moderation_api.dart
index 1e6c33d..dcf98d8 100644
--- a/client/lib/api/moderation_api.dart
+++ b/client/lib/api/moderation_api.dart
@@ -23,12 +23,17 @@ class ModerationApi {
   ///
   /// * [String] voteId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> deleteModerationVoteWithHttpInfo(ApiDeleteModerationVoteRequest request,) async {
+    final commentId = request.commentId;
+    final voteId = request.voteId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/vote/{commentId}/{voteId}'
       .replaceAll('{commentId}', commentId)
@@ -41,12 +46,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -71,13 +76,13 @@ class ModerationApi {
   ///
   /// * [String] voteId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<VoteDeleteResponse?> deleteModerationVote(ApiDeleteModerationVoteRequest request,) async {
+    final response = await deleteModerationVoteWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -113,7 +118,17 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiCommentsWithHttpInfo({ double? page, double? count, String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, bool? demo, String? tenantId, String? sso, }) async {
+  Future<Response> getApiCommentsWithHttpInfo(ApiGetApiCommentsRequest request,) async {
+    final page = request.page;
+    final count = request.count;
+    final textSearch = request.textSearch;
+    final byIPFromComment = request.byIPFromComment;
+    final filters = request.filters;
+    final searchFilters = request.searchFilters;
+    final sorts = request.sorts;
+    final demo = request.demo;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/comments';
 
@@ -190,8 +205,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentsResponse?> getApiComments({ double? page, double? count, String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, bool? demo, String? tenantId, String? sso, }) async {
-    final response = await getApiCommentsWithHttpInfo( page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, tenantId: tenantId, sso: sso, );
+  Future<ModerationAPIGetCommentsResponse?> getApiComments(ApiGetApiCommentsRequest request,) async {
+    final response = await getApiCommentsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -213,7 +228,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiExportStatusWithHttpInfo({ String? batchJobId, String? tenantId, String? sso, }) async {
+  Future<Response> getApiExportStatusWithHttpInfo(ApiGetApiExportStatusRequest request,) async {
+    final batchJobId = request.batchJobId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/export/status';
 
@@ -255,8 +273,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationExportStatusResponse?> getApiExportStatus({ String? batchJobId, String? tenantId, String? sso, }) async {
-    final response = await getApiExportStatusWithHttpInfo( batchJobId: batchJobId, tenantId: tenantId, sso: sso, );
+  Future<ModerationExportStatusResponse?> getApiExportStatus(ApiGetApiExportStatusRequest request,) async {
+    final response = await getApiExportStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -288,7 +306,15 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiIdsWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? afterId, bool? demo, String? tenantId, String? sso, }) async {
+  Future<Response> getApiIdsWithHttpInfo(ApiGetApiIdsRequest request,) async {
+    final textSearch = request.textSearch;
+    final byIPFromComment = request.byIPFromComment;
+    final filters = request.filters;
+    final searchFilters = request.searchFilters;
+    final afterId = request.afterId;
+    final demo = request.demo;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/ids';
 
@@ -355,8 +381,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentIdsResponse?> getApiIds({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? afterId, bool? demo, String? tenantId, String? sso, }) async {
-    final response = await getApiIdsWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, tenantId: tenantId, sso: sso, );
+  Future<ModerationAPIGetCommentIdsResponse?> getApiIds(ApiGetApiIdsRequest request,) async {
+    final response = await getApiIdsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -378,7 +404,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
+  Future<Response> getBanUsersFromCommentWithHttpInfo(ApiGetBanUsersFromCommentRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-users/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -418,8 +447,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, { String? tenantId, String? sso, }) async {
-    final response = await getBanUsersFromCommentWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
+  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(ApiGetBanUsersFromCommentRequest request,) async {
+    final response = await getBanUsersFromCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -441,7 +470,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
+  Future<Response> getCommentBanStatusWithHttpInfo(ApiGetCommentBanStatusRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-comment-ban-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -481,8 +513,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, { String? tenantId, String? sso, }) async {
-    final response = await getCommentBanStatusWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
+  Future<GetCommentBanStatusResponse?> getCommentBanStatus(ApiGetCommentBanStatusRequest request,) async {
+    final response = await getCommentBanStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -504,7 +536,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCommentChildrenWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
+  Future<Response> getCommentChildrenWithHttpInfo(ApiGetCommentChildrenRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comment-children/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -544,8 +579,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, { String? tenantId, String? sso, }) async {
-    final response = await getCommentChildrenWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
+  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(ApiGetCommentChildrenRequest request,) async {
+    final response = await getCommentChildrenWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -575,7 +610,14 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCountWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filter, String? searchFilters, bool? demo, String? tenantId, String? sso, }) async {
+  Future<Response> getCountWithHttpInfo(ApiGetCountRequest request,) async {
+    final textSearch = request.textSearch;
+    final byIPFromComment = request.byIPFromComment;
+    final filter = request.filter;
+    final searchFilters = request.searchFilters;
+    final demo = request.demo;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/count';
 
@@ -637,8 +679,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPICountCommentsResponse?> getCount({ String? textSearch, String? byIPFromComment, String? filter, String? searchFilters, bool? demo, String? tenantId, String? sso, }) async {
-    final response = await getCountWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, tenantId: tenantId, sso: sso, );
+  Future<ModerationAPICountCommentsResponse?> getCount(ApiGetCountRequest request,) async {
+    final response = await getCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -658,7 +700,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCountsWithHttpInfo({ String? tenantId, String? sso, }) async {
+  Future<Response> getCountsWithHttpInfo(ApiGetCountsRequest request,) async {
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/banned-users/counts';
 
@@ -695,8 +739,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetBannedUsersCountResponse?> getCounts({ String? tenantId, String? sso, }) async {
-    final response = await getCountsWithHttpInfo( tenantId: tenantId, sso: sso, );
+  Future<GetBannedUsersCountResponse?> getCounts(ApiGetCountsRequest request,) async {
+    final response = await getCountsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -718,7 +762,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getLogsWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
+  Future<Response> getLogsWithHttpInfo(ApiGetLogsRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/logs/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -758,8 +805,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, { String? tenantId, String? sso, }) async {
-    final response = await getLogsWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
+  Future<ModerationAPIGetLogsResponse?> getLogs(ApiGetLogsRequest request,) async {
+    final response = await getLogsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -779,7 +826,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesWithHttpInfo({ String? tenantId, String? sso, }) async {
+  Future<Response> getManualBadgesWithHttpInfo(ApiGetManualBadgesRequest request,) async {
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-manual-badges';
 
@@ -816,8 +865,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetTenantManualBadgesResponse?> getManualBadges({ String? tenantId, String? sso, }) async {
-    final response = await getManualBadgesWithHttpInfo( tenantId: tenantId, sso: sso, );
+  Future<GetTenantManualBadgesResponse?> getManualBadges(ApiGetManualBadgesRequest request,) async {
+    final response = await getManualBadgesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -841,7 +890,11 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesForUserWithHttpInfo({ String? badgesUserId, String? commentId, String? tenantId, String? sso, }) async {
+  Future<Response> getManualBadgesForUserWithHttpInfo(ApiGetManualBadgesForUserRequest request,) async {
+    final badgesUserId = request.badgesUserId;
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-manual-badges-for-user';
 
@@ -888,8 +941,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserManualBadgesResponse?> getManualBadgesForUser({ String? badgesUserId, String? commentId, String? tenantId, String? sso, }) async {
-    final response = await getManualBadgesForUserWithHttpInfo( badgesUserId: badgesUserId, commentId: commentId, tenantId: tenantId, sso: sso, );
+  Future<GetUserManualBadgesResponse?> getManualBadgesForUser(ApiGetManualBadgesForUserRequest request,) async {
+    final response = await getManualBadgesForUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -915,7 +968,12 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentWithHttpInfo(String commentId, { bool? includeEmail, bool? includeIP, String? tenantId, String? sso, }) async {
+  Future<Response> getModerationCommentWithHttpInfo(ApiGetModerationCommentRequest request,) async {
+    final commentId = request.commentId;
+    final includeEmail = request.includeEmail;
+    final includeIP = request.includeIP;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -965,8 +1023,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, { bool? includeEmail, bool? includeIP, String? tenantId, String? sso, }) async {
-    final response = await getModerationCommentWithHttpInfo(commentId,  includeEmail: includeEmail, includeIP: includeIP, tenantId: tenantId, sso: sso, );
+  Future<ModerationAPICommentResponse?> getModerationComment(ApiGetModerationCommentRequest request,) async {
+    final response = await getModerationCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -988,7 +1046,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, { String? tenantId, String? sso, }) async {
+  Future<Response> getModerationCommentTextWithHttpInfo(ApiGetModerationCommentTextRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1028,8 +1089,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, { String? tenantId, String? sso, }) async {
-    final response = await getModerationCommentTextWithHttpInfo(commentId,  tenantId: tenantId, sso: sso, );
+  Future<GetCommentTextResponse?> getModerationCommentText(ApiGetModerationCommentTextRequest request,) async {
+    final response = await getModerationCommentTextWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1057,7 +1118,13 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
+  Future<Response> getPreBanSummaryWithHttpInfo(ApiGetPreBanSummaryRequest request,) async {
+    final commentId = request.commentId;
+    final includeByUserIdAndEmail = request.includeByUserIdAndEmail;
+    final includeByIP = request.includeByIP;
+    final includeByEmailDomain = request.includeByEmailDomain;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/pre-ban-summary/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1112,8 +1179,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<PreBanSummary?> getPreBanSummary(String commentId, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
-    final response = await getPreBanSummaryWithHttpInfo(commentId,  includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso, );
+  Future<PreBanSummary?> getPreBanSummary(ApiGetPreBanSummaryRequest request,) async {
+    final response = await getPreBanSummaryWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1139,7 +1206,12 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchCommentsSummaryWithHttpInfo({ String? value, String? filters, String? searchFilters, String? tenantId, String? sso, }) async {
+  Future<Response> getSearchCommentsSummaryWithHttpInfo(ApiGetSearchCommentsSummaryRequest request,) async {
+    final value = request.value;
+    final filters = request.filters;
+    final searchFilters = request.searchFilters;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/comments/summary';
 
@@ -1191,8 +1263,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary({ String? value, String? filters, String? searchFilters, String? tenantId, String? sso, }) async {
-    final response = await getSearchCommentsSummaryWithHttpInfo( value: value, filters: filters, searchFilters: searchFilters, tenantId: tenantId, sso: sso, );
+  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary(ApiGetSearchCommentsSummaryRequest request,) async {
+    final response = await getSearchCommentsSummaryWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1214,7 +1286,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchPagesWithHttpInfo({ String? value, String? tenantId, String? sso, }) async {
+  Future<Response> getSearchPagesWithHttpInfo(ApiGetSearchPagesRequest request,) async {
+    final value = request.value;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/pages';
 
@@ -1256,8 +1331,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationPageSearchResponse?> getSearchPages({ String? value, String? tenantId, String? sso, }) async {
-    final response = await getSearchPagesWithHttpInfo( value: value, tenantId: tenantId, sso: sso, );
+  Future<ModerationPageSearchResponse?> getSearchPages(ApiGetSearchPagesRequest request,) async {
+    final response = await getSearchPagesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1279,7 +1354,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSitesWithHttpInfo({ String? value, String? tenantId, String? sso, }) async {
+  Future<Response> getSearchSitesWithHttpInfo(ApiGetSearchSitesRequest request,) async {
+    final value = request.value;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/sites';
 
@@ -1321,8 +1399,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationSiteSearchResponse?> getSearchSites({ String? value, String? tenantId, String? sso, }) async {
-    final response = await getSearchSitesWithHttpInfo( value: value, tenantId: tenantId, sso: sso, );
+  Future<ModerationSiteSearchResponse?> getSearchSites(ApiGetSearchSitesRequest request,) async {
+    final response = await getSearchSitesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1344,7 +1422,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSuggestWithHttpInfo({ String? textSearch, String? tenantId, String? sso, }) async {
+  Future<Response> getSearchSuggestWithHttpInfo(ApiGetSearchSuggestRequest request,) async {
+    final textSearch = request.textSearch;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/suggest';
 
@@ -1386,8 +1467,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationSuggestResponse?> getSearchSuggest({ String? textSearch, String? tenantId, String? sso, }) async {
-    final response = await getSearchSuggestWithHttpInfo( textSearch: textSearch, tenantId: tenantId, sso: sso, );
+  Future<ModerationSuggestResponse?> getSearchSuggest(ApiGetSearchSuggestRequest request,) async {
+    final response = await getSearchSuggestWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1409,7 +1490,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchUsersWithHttpInfo({ String? value, String? tenantId, String? sso, }) async {
+  Future<Response> getSearchUsersWithHttpInfo(ApiGetSearchUsersRequest request,) async {
+    final value = request.value;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/users';
 
@@ -1451,8 +1535,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationUserSearchResponse?> getSearchUsers({ String? value, String? tenantId, String? sso, }) async {
-    final response = await getSearchUsersWithHttpInfo( value: value, tenantId: tenantId, sso: sso, );
+  Future<ModerationUserSearchResponse?> getSearchUsers(ApiGetSearchUsersRequest request,) async {
+    final response = await getSearchUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1474,7 +1558,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getTrustFactorWithHttpInfo({ String? userId, String? tenantId, String? sso, }) async {
+  Future<Response> getTrustFactorWithHttpInfo(ApiGetTrustFactorRequest request,) async {
+    final userId = request.userId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-trust-factor';
 
@@ -1516,8 +1603,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserTrustFactorResponse?> getTrustFactor({ String? userId, String? tenantId, String? sso, }) async {
-    final response = await getTrustFactorWithHttpInfo( userId: userId, tenantId: tenantId, sso: sso, );
+  Future<GetUserTrustFactorResponse?> getTrustFactor(ApiGetTrustFactorRequest request,) async {
+    final response = await getTrustFactorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1537,7 +1624,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getUserBanPreferenceWithHttpInfo({ String? tenantId, String? sso, }) async {
+  Future<Response> getUserBanPreferenceWithHttpInfo(ApiGetUserBanPreferenceRequest request,) async {
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/user-ban-preference';
 
@@ -1574,8 +1663,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference({ String? tenantId, String? sso, }) async {
-    final response = await getUserBanPreferenceWithHttpInfo( tenantId: tenantId, sso: sso, );
+  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference(ApiGetUserBanPreferenceRequest request,) async {
+    final response = await getUserBanPreferenceWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1597,7 +1686,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getUserInternalProfileWithHttpInfo({ String? commentId, String? tenantId, String? sso, }) async {
+  Future<Response> getUserInternalProfileWithHttpInfo(ApiGetUserInternalProfileRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-user-internal-profile';
 
@@ -1639,8 +1731,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserInternalProfileResponse?> getUserInternalProfile({ String? commentId, String? tenantId, String? sso, }) async {
-    final response = await getUserInternalProfileWithHttpInfo( commentId: commentId, tenantId: tenantId, sso: sso, );
+  Future<GetUserInternalProfileResponse?> getUserInternalProfile(ApiGetUserInternalProfileRequest request,) async {
+    final response = await getUserInternalProfileWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1661,12 +1753,17 @@ class ModerationApi {
   ///
   /// * [AdjustCommentVotesParams] adjustCommentVotesParams (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postAdjustCommentVotesWithHttpInfo(ApiPostAdjustCommentVotesRequest request,) async {
+    final commentId = request.commentId;
+    final adjustCommentVotesParams = request.adjustCommentVotesParams;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/adjust-comment-votes/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1678,12 +1775,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1708,13 +1805,13 @@ class ModerationApi {
   ///
   /// * [AdjustCommentVotesParams] adjustCommentVotesParams (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<AdjustVotesResponse?> postAdjustCommentVotes(ApiPostAdjustCommentVotesRequest request,) async {
+    final response = await postAdjustCommentVotesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1744,7 +1841,14 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postApiExportWithHttpInfo({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, String? tenantId, String? sso, }) async {
+  Future<Response> postApiExportWithHttpInfo(ApiPostApiExportRequest request,) async {
+    final textSearch = request.textSearch;
+    final byIPFromComment = request.byIPFromComment;
+    final filters = request.filters;
+    final searchFilters = request.searchFilters;
+    final sorts = request.sorts;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/export';
 
@@ -1806,8 +1910,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationExportResponse?> postApiExport({ String? textSearch, String? byIPFromComment, String? filters, String? searchFilters, String? sorts, String? tenantId, String? sso, }) async {
-    final response = await postApiExportWithHttpInfo( textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, tenantId: tenantId, sso: sso, );
+  Future<ModerationExportResponse?> postApiExport(ApiPostApiExportRequest request,) async {
+    final response = await postApiExportWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1845,7 +1949,18 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, { bool? banEmail, bool? banEmailDomain, bool? banIP, bool? deleteAllUsersComments, String? bannedUntil, bool? isShadowBan, String? updateId, String? banReason, String? tenantId, String? sso, }) async {
+  Future<Response> postBanUserFromCommentWithHttpInfo(ApiPostBanUserFromCommentRequest request,) async {
+    final commentId = request.commentId;
+    final banEmail = request.banEmail;
+    final banEmailDomain = request.banEmailDomain;
+    final banIP = request.banIP;
+    final deleteAllUsersComments = request.deleteAllUsersComments;
+    final bannedUntil = request.bannedUntil;
+    final isShadowBan = request.isShadowBan;
+    final updateId = request.updateId;
+    final banReason = request.banReason;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-user/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1925,8 +2040,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, { bool? banEmail, bool? banEmailDomain, bool? banIP, bool? deleteAllUsersComments, String? bannedUntil, bool? isShadowBan, String? updateId, String? banReason, String? tenantId, String? sso, }) async {
-    final response = await postBanUserFromCommentWithHttpInfo(commentId,  banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, tenantId: tenantId, sso: sso, );
+  Future<BanUserFromCommentResult?> postBanUserFromComment(ApiPostBanUserFromCommentRequest request,) async {
+    final response = await postBanUserFromCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1948,7 +2063,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, { String? tenantId, String? sso, }) async {
+  Future<Response> postBanUserUndoWithHttpInfo(ApiPostBanUserUndoRequest request,) async {
+    final banUserUndoParams = request.banUserUndoParams;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-user/undo';
 
@@ -1987,8 +2105,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, { String? tenantId, String? sso, }) async {
-    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams,  tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> postBanUserUndo(ApiPostBanUserUndoRequest request,) async {
+    final response = await postBanUserUndoWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2016,7 +2134,13 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
+  Future<Response> postBulkPreBanSummaryWithHttpInfo(ApiPostBulkPreBanSummaryRequest request,) async {
+    final bulkPreBanParams = request.bulkPreBanParams;
+    final includeByUserIdAndEmail = request.includeByUserIdAndEmail;
+    final includeByIP = request.includeByIP;
+    final includeByEmailDomain = request.includeByEmailDomain;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/bulk-pre-ban-summary';
 
@@ -2070,8 +2194,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, { bool? includeByUserIdAndEmail, bool? includeByIP, bool? includeByEmailDomain, String? tenantId, String? sso, }) async {
-    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams,  includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso, );
+  Future<BulkPreBanSummary?> postBulkPreBanSummary(ApiPostBulkPreBanSummaryRequest request,) async {
+    final response = await postBulkPreBanSummaryWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2093,7 +2217,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, { String? tenantId, String? sso, }) async {
+  Future<Response> postCommentsByIdsWithHttpInfo(ApiPostCommentsByIdsRequest request,) async {
+    final commentsByIdsParams = request.commentsByIdsParams;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comments-by-ids';
 
@@ -2132,8 +2259,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, { String? tenantId, String? sso, }) async {
-    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams,  tenantId: tenantId, sso: sso, );
+  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(ApiPostCommentsByIdsRequest request,) async {
+    final response = await postCommentsByIdsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2152,12 +2279,16 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postFlagCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postFlagCommentWithHttpInfo(ApiPostFlagCommentRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2169,12 +2300,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2197,13 +2328,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postFlagComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postFlagCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> postFlagComment(ApiPostFlagCommentRequest request,) async {
+    final response = await postFlagCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2222,12 +2353,16 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postRemoveCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postRemoveCommentWithHttpInfo(ApiPostRemoveCommentRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/remove-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2239,12 +2374,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2267,13 +2402,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postRemoveCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<PostRemoveCommentResponse?> postRemoveComment(ApiPostRemoveCommentRequest request,) async {
+    final response = await postRemoveCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2292,12 +2427,16 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postRestoreDeletedCommentWithHttpInfo(ApiPostRestoreDeletedCommentRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/restore-deleted-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2309,12 +2448,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2337,13 +2476,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postRestoreDeletedCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> postRestoreDeletedComment(ApiPostRestoreDeletedCommentRequest request,) async {
+    final response = await postRestoreDeletedCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2364,12 +2503,17 @@ class ModerationApi {
   ///
   /// * [bool] approved:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, { bool? approved, String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postSetCommentApprovalStatusWithHttpInfo(ApiPostSetCommentApprovalStatusRequest request,) async {
+    final commentId = request.commentId;
+    final approved = request.approved;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-approval-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2384,12 +2528,12 @@ class ModerationApi {
     if (approved != null) {
       queryParams.addAll(_queryParams('', 'approved', approved));
     }
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2414,13 +2558,13 @@ class ModerationApi {
   ///
   /// * [bool] approved:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, { bool? approved, String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId,  approved: approved, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(ApiPostSetCommentApprovalStatusRequest request,) async {
+    final response = await postSetCommentApprovalStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2441,12 +2585,17 @@ class ModerationApi {
   ///
   /// * [bool] reviewed:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, { bool? reviewed, String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postSetCommentReviewStatusWithHttpInfo(ApiPostSetCommentReviewStatusRequest request,) async {
+    final commentId = request.commentId;
+    final reviewed = request.reviewed;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-review-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2461,12 +2610,12 @@ class ModerationApi {
     if (reviewed != null) {
       queryParams.addAll(_queryParams('', 'reviewed', reviewed));
     }
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2491,13 +2640,13 @@ class ModerationApi {
   ///
   /// * [bool] reviewed:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, { bool? reviewed, String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postSetCommentReviewStatusWithHttpInfo(commentId,  reviewed: reviewed, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> postSetCommentReviewStatus(ApiPostSetCommentReviewStatusRequest request,) async {
+    final response = await postSetCommentReviewStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2520,12 +2669,18 @@ class ModerationApi {
   ///
   /// * [bool] permNotSpam:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, { bool? spam, bool? permNotSpam, String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postSetCommentSpamStatusWithHttpInfo(ApiPostSetCommentSpamStatusRequest request,) async {
+    final commentId = request.commentId;
+    final spam = request.spam;
+    final permNotSpam = request.permNotSpam;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-spam-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2543,12 +2698,12 @@ class ModerationApi {
     if (permNotSpam != null) {
       queryParams.addAll(_queryParams('', 'permNotSpam', permNotSpam));
     }
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2575,13 +2730,13 @@ class ModerationApi {
   ///
   /// * [bool] permNotSpam:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, { bool? spam, bool? permNotSpam, String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postSetCommentSpamStatusWithHttpInfo(commentId,  spam: spam, permNotSpam: permNotSpam, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> postSetCommentSpamStatus(ApiPostSetCommentSpamStatusRequest request,) async {
+    final response = await postSetCommentSpamStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2602,12 +2757,17 @@ class ModerationApi {
   ///
   /// * [SetCommentTextParams] setCommentTextParams (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postSetCommentTextWithHttpInfo(ApiPostSetCommentTextRequest request,) async {
+    final commentId = request.commentId;
+    final setCommentTextParams = request.setCommentTextParams;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2619,12 +2779,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2649,13 +2809,13 @@ class ModerationApi {
   ///
   /// * [SetCommentTextParams] setCommentTextParams (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<SetCommentTextResponse?> postSetCommentText(ApiPostSetCommentTextRequest request,) async {
+    final response = await postSetCommentTextWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2674,12 +2834,16 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postUnFlagCommentWithHttpInfo(ApiPostUnFlagCommentRequest request,) async {
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/un-flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2691,12 +2855,12 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2719,13 +2883,13 @@ class ModerationApi {
   ///
   /// * [String] commentId (required):
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postUnFlagComment(String commentId, { String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postUnFlagCommentWithHttpInfo(commentId,  broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> postUnFlagComment(ApiPostUnFlagCommentRequest request,) async {
+    final response = await postUnFlagCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2746,12 +2910,17 @@ class ModerationApi {
   ///
   /// * [String] direction:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> postVoteWithHttpInfo(String commentId, { String? direction, String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> postVoteWithHttpInfo(ApiPostVoteRequest request,) async {
+    final commentId = request.commentId;
+    final direction = request.direction;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/vote/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2766,12 +2935,12 @@ class ModerationApi {
     if (direction != null) {
       queryParams.addAll(_queryParams('', 'direction', direction));
     }
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2796,13 +2965,13 @@ class ModerationApi {
   ///
   /// * [String] direction:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<VoteResponse?> postVote(String commentId, { String? direction, String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await postVoteWithHttpInfo(commentId,  direction: direction, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<VoteResponse?> postVote(ApiPostVoteRequest request,) async {
+    final response = await postVoteWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2825,12 +2994,18 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> putAwardBadgeWithHttpInfo(ApiPutAwardBadgeRequest request,) async {
+    final badgeId = request.badgeId;
+    final userId = request.userId;
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/award-badge';
 
@@ -2848,12 +3023,12 @@ class ModerationApi {
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2880,13 +3055,13 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await putAwardBadgeWithHttpInfo(badgeId,  userId: userId, commentId: commentId, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<AwardUserBadgeResponse?> putAwardBadge(ApiPutAwardBadgeRequest request,) async {
+    final response = await putAwardBadgeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2908,7 +3083,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> putCloseThreadWithHttpInfo(String urlId, { String? tenantId, String? sso, }) async {
+  Future<Response> putCloseThreadWithHttpInfo(ApiPutCloseThreadRequest request,) async {
+    final urlId = request.urlId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/close-thread';
 
@@ -2948,8 +3126,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putCloseThread(String urlId, { String? tenantId, String? sso, }) async {
-    final response = await putCloseThreadWithHttpInfo(urlId,  tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> putCloseThread(ApiPutCloseThreadRequest request,) async {
+    final response = await putCloseThreadWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2972,12 +3150,18 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
+  Future<Response> putRemoveBadgeWithHttpInfo(ApiPutRemoveBadgeRequest request,) async {
+    final badgeId = request.badgeId;
+    final userId = request.userId;
+    final commentId = request.commentId;
+    final tenantId = request.tenantId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/remove-badge';
 
@@ -2995,12 +3179,12 @@ class ModerationApi {
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
-    if (broadcastId != null) {
-      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
-    }
     if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     }
+    if (broadcastId != null) {
+      queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
+    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -3027,13 +3211,13 @@ class ModerationApi {
   ///
   /// * [String] commentId:
   ///
-  /// * [String] broadcastId:
-  ///
   /// * [String] tenantId:
   ///
+  /// * [String] broadcastId:
+  ///
   /// * [String] sso:
-  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, { String? userId, String? commentId, String? broadcastId, String? tenantId, String? sso, }) async {
-    final response = await putRemoveBadgeWithHttpInfo(badgeId,  userId: userId, commentId: commentId, broadcastId: broadcastId, tenantId: tenantId, sso: sso, );
+  Future<RemoveUserBadgeResponse?> putRemoveBadge(ApiPutRemoveBadgeRequest request,) async {
+    final response = await putRemoveBadgeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3055,7 +3239,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> putReopenThreadWithHttpInfo(String urlId, { String? tenantId, String? sso, }) async {
+  Future<Response> putReopenThreadWithHttpInfo(ApiPutReopenThreadRequest request,) async {
+    final urlId = request.urlId;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/reopen-thread';
 
@@ -3095,8 +3282,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putReopenThread(String urlId, { String? tenantId, String? sso, }) async {
-    final response = await putReopenThreadWithHttpInfo(urlId,  tenantId: tenantId, sso: sso, );
+  Future<APIEmptyResponse?> putReopenThread(ApiPutReopenThreadRequest request,) async {
+    final response = await putReopenThreadWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3120,7 +3307,11 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> setTrustFactorWithHttpInfo({ String? userId, String? trustFactor, String? tenantId, String? sso, }) async {
+  Future<Response> setTrustFactorWithHttpInfo(ApiSetTrustFactorRequest request,) async {
+    final userId = request.userId;
+    final trustFactor = request.trustFactor;
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-trust-factor';
 
@@ -3167,8 +3358,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<SetUserTrustFactorResponse?> setTrustFactor({ String? userId, String? trustFactor, String? tenantId, String? sso, }) async {
-    final response = await setTrustFactorWithHttpInfo( userId: userId, trustFactor: trustFactor, tenantId: tenantId, sso: sso, );
+  Future<SetUserTrustFactorResponse?> setTrustFactor(ApiSetTrustFactorRequest request,) async {
+    final response = await setTrustFactorWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3182,3 +3373,643 @@ class ModerationApi {
     return null;
   }
 }
+
+/// Request parameters for [ModerationApi.deleteModerationVote].
+class ApiDeleteModerationVoteRequest {
+  const ApiDeleteModerationVoteRequest({
+    required this.commentId,
+    required this.voteId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final String voteId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getApiComments].
+class ApiGetApiCommentsRequest {
+  const ApiGetApiCommentsRequest({
+    this.page,
+    this.count,
+    this.textSearch,
+    this.byIPFromComment,
+    this.filters,
+    this.searchFilters,
+    this.sorts,
+    this.demo,
+    this.tenantId,
+    this.sso,
+  });
+  final double? page;
+  final double? count;
+  final String? textSearch;
+  final String? byIPFromComment;
+  final String? filters;
+  final String? searchFilters;
+  final String? sorts;
+  final bool? demo;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getApiExportStatus].
+class ApiGetApiExportStatusRequest {
+  const ApiGetApiExportStatusRequest({
+    this.batchJobId,
+    this.tenantId,
+    this.sso,
+  });
+  final String? batchJobId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getApiIds].
+class ApiGetApiIdsRequest {
+  const ApiGetApiIdsRequest({
+    this.textSearch,
+    this.byIPFromComment,
+    this.filters,
+    this.searchFilters,
+    this.afterId,
+    this.demo,
+    this.tenantId,
+    this.sso,
+  });
+  final String? textSearch;
+  final String? byIPFromComment;
+  final String? filters;
+  final String? searchFilters;
+  final String? afterId;
+  final bool? demo;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getBanUsersFromComment].
+class ApiGetBanUsersFromCommentRequest {
+  const ApiGetBanUsersFromCommentRequest({
+    required this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getCommentBanStatus].
+class ApiGetCommentBanStatusRequest {
+  const ApiGetCommentBanStatusRequest({
+    required this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getCommentChildren].
+class ApiGetCommentChildrenRequest {
+  const ApiGetCommentChildrenRequest({
+    required this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getCount].
+class ApiGetCountRequest {
+  const ApiGetCountRequest({
+    this.textSearch,
+    this.byIPFromComment,
+    this.filter,
+    this.searchFilters,
+    this.demo,
+    this.tenantId,
+    this.sso,
+  });
+  final String? textSearch;
+  final String? byIPFromComment;
+  final String? filter;
+  final String? searchFilters;
+  final bool? demo;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getCounts].
+class ApiGetCountsRequest {
+  const ApiGetCountsRequest({
+    this.tenantId,
+    this.sso,
+  });
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getLogs].
+class ApiGetLogsRequest {
+  const ApiGetLogsRequest({
+    required this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getManualBadges].
+class ApiGetManualBadgesRequest {
+  const ApiGetManualBadgesRequest({
+    this.tenantId,
+    this.sso,
+  });
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getManualBadgesForUser].
+class ApiGetManualBadgesForUserRequest {
+  const ApiGetManualBadgesForUserRequest({
+    this.badgesUserId,
+    this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String? badgesUserId;
+  final String? commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getModerationComment].
+class ApiGetModerationCommentRequest {
+  const ApiGetModerationCommentRequest({
+    required this.commentId,
+    this.includeEmail,
+    this.includeIP,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final bool? includeEmail;
+  final bool? includeIP;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getModerationCommentText].
+class ApiGetModerationCommentTextRequest {
+  const ApiGetModerationCommentTextRequest({
+    required this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getPreBanSummary].
+class ApiGetPreBanSummaryRequest {
+  const ApiGetPreBanSummaryRequest({
+    required this.commentId,
+    this.includeByUserIdAndEmail,
+    this.includeByIP,
+    this.includeByEmailDomain,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final bool? includeByUserIdAndEmail;
+  final bool? includeByIP;
+  final bool? includeByEmailDomain;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getSearchCommentsSummary].
+class ApiGetSearchCommentsSummaryRequest {
+  const ApiGetSearchCommentsSummaryRequest({
+    this.value,
+    this.filters,
+    this.searchFilters,
+    this.tenantId,
+    this.sso,
+  });
+  final String? value;
+  final String? filters;
+  final String? searchFilters;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getSearchPages].
+class ApiGetSearchPagesRequest {
+  const ApiGetSearchPagesRequest({
+    this.value,
+    this.tenantId,
+    this.sso,
+  });
+  final String? value;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getSearchSites].
+class ApiGetSearchSitesRequest {
+  const ApiGetSearchSitesRequest({
+    this.value,
+    this.tenantId,
+    this.sso,
+  });
+  final String? value;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getSearchSuggest].
+class ApiGetSearchSuggestRequest {
+  const ApiGetSearchSuggestRequest({
+    this.textSearch,
+    this.tenantId,
+    this.sso,
+  });
+  final String? textSearch;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getSearchUsers].
+class ApiGetSearchUsersRequest {
+  const ApiGetSearchUsersRequest({
+    this.value,
+    this.tenantId,
+    this.sso,
+  });
+  final String? value;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getTrustFactor].
+class ApiGetTrustFactorRequest {
+  const ApiGetTrustFactorRequest({
+    this.userId,
+    this.tenantId,
+    this.sso,
+  });
+  final String? userId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getUserBanPreference].
+class ApiGetUserBanPreferenceRequest {
+  const ApiGetUserBanPreferenceRequest({
+    this.tenantId,
+    this.sso,
+  });
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.getUserInternalProfile].
+class ApiGetUserInternalProfileRequest {
+  const ApiGetUserInternalProfileRequest({
+    this.commentId,
+    this.tenantId,
+    this.sso,
+  });
+  final String? commentId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postAdjustCommentVotes].
+class ApiPostAdjustCommentVotesRequest {
+  const ApiPostAdjustCommentVotesRequest({
+    required this.commentId,
+    required this.adjustCommentVotesParams,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final AdjustCommentVotesParams adjustCommentVotesParams;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postApiExport].
+class ApiPostApiExportRequest {
+  const ApiPostApiExportRequest({
+    this.textSearch,
+    this.byIPFromComment,
+    this.filters,
+    this.searchFilters,
+    this.sorts,
+    this.tenantId,
+    this.sso,
+  });
+  final String? textSearch;
+  final String? byIPFromComment;
+  final String? filters;
+  final String? searchFilters;
+  final String? sorts;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postBanUserFromComment].
+class ApiPostBanUserFromCommentRequest {
+  const ApiPostBanUserFromCommentRequest({
+    required this.commentId,
+    this.banEmail,
+    this.banEmailDomain,
+    this.banIP,
+    this.deleteAllUsersComments,
+    this.bannedUntil,
+    this.isShadowBan,
+    this.updateId,
+    this.banReason,
+    this.tenantId,
+    this.sso,
+  });
+  final String commentId;
+  final bool? banEmail;
+  final bool? banEmailDomain;
+  final bool? banIP;
+  final bool? deleteAllUsersComments;
+  final String? bannedUntil;
+  final bool? isShadowBan;
+  final String? updateId;
+  final String? banReason;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postBanUserUndo].
+class ApiPostBanUserUndoRequest {
+  const ApiPostBanUserUndoRequest({
+    required this.banUserUndoParams,
+    this.tenantId,
+    this.sso,
+  });
+  final BanUserUndoParams banUserUndoParams;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postBulkPreBanSummary].
+class ApiPostBulkPreBanSummaryRequest {
+  const ApiPostBulkPreBanSummaryRequest({
+    required this.bulkPreBanParams,
+    this.includeByUserIdAndEmail,
+    this.includeByIP,
+    this.includeByEmailDomain,
+    this.tenantId,
+    this.sso,
+  });
+  final BulkPreBanParams bulkPreBanParams;
+  final bool? includeByUserIdAndEmail;
+  final bool? includeByIP;
+  final bool? includeByEmailDomain;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postCommentsByIds].
+class ApiPostCommentsByIdsRequest {
+  const ApiPostCommentsByIdsRequest({
+    required this.commentsByIdsParams,
+    this.tenantId,
+    this.sso,
+  });
+  final CommentsByIdsParams commentsByIdsParams;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postFlagComment].
+class ApiPostFlagCommentRequest {
+  const ApiPostFlagCommentRequest({
+    required this.commentId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postRemoveComment].
+class ApiPostRemoveCommentRequest {
+  const ApiPostRemoveCommentRequest({
+    required this.commentId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postRestoreDeletedComment].
+class ApiPostRestoreDeletedCommentRequest {
+  const ApiPostRestoreDeletedCommentRequest({
+    required this.commentId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postSetCommentApprovalStatus].
+class ApiPostSetCommentApprovalStatusRequest {
+  const ApiPostSetCommentApprovalStatusRequest({
+    required this.commentId,
+    this.approved,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final bool? approved;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postSetCommentReviewStatus].
+class ApiPostSetCommentReviewStatusRequest {
+  const ApiPostSetCommentReviewStatusRequest({
+    required this.commentId,
+    this.reviewed,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final bool? reviewed;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postSetCommentSpamStatus].
+class ApiPostSetCommentSpamStatusRequest {
+  const ApiPostSetCommentSpamStatusRequest({
+    required this.commentId,
+    this.spam,
+    this.permNotSpam,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final bool? spam;
+  final bool? permNotSpam;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postSetCommentText].
+class ApiPostSetCommentTextRequest {
+  const ApiPostSetCommentTextRequest({
+    required this.commentId,
+    required this.setCommentTextParams,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final SetCommentTextParams setCommentTextParams;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postUnFlagComment].
+class ApiPostUnFlagCommentRequest {
+  const ApiPostUnFlagCommentRequest({
+    required this.commentId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.postVote].
+class ApiPostVoteRequest {
+  const ApiPostVoteRequest({
+    required this.commentId,
+    this.direction,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String commentId;
+  final String? direction;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.putAwardBadge].
+class ApiPutAwardBadgeRequest {
+  const ApiPutAwardBadgeRequest({
+    required this.badgeId,
+    this.userId,
+    this.commentId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String badgeId;
+  final String? userId;
+  final String? commentId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.putCloseThread].
+class ApiPutCloseThreadRequest {
+  const ApiPutCloseThreadRequest({
+    required this.urlId,
+    this.tenantId,
+    this.sso,
+  });
+  final String urlId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.putRemoveBadge].
+class ApiPutRemoveBadgeRequest {
+  const ApiPutRemoveBadgeRequest({
+    required this.badgeId,
+    this.userId,
+    this.commentId,
+    this.tenantId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String badgeId;
+  final String? userId;
+  final String? commentId;
+  final String? tenantId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.putReopenThread].
+class ApiPutReopenThreadRequest {
+  const ApiPutReopenThreadRequest({
+    required this.urlId,
+    this.tenantId,
+    this.sso,
+  });
+  final String urlId;
+  final String? tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [ModerationApi.setTrustFactor].
+class ApiSetTrustFactorRequest {
+  const ApiSetTrustFactorRequest({
+    this.userId,
+    this.trustFactor,
+    this.tenantId,
+    this.sso,
+  });
+  final String? userId;
+  final String? trustFactor;
+  final String? tenantId;
+  final String? sso;
+}
diff --git a/client/lib/api/public_api.dart b/client/lib/api/public_api.dart
index 43a384e..1b088da 100644
--- a/client/lib/api/public_api.dart
+++ b/client/lib/api/public_api.dart
@@ -26,7 +26,11 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> blockFromCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, { String? sso, }) async {
+  Future<Response> blockFromCommentPublicWithHttpInfo(ApiBlockFromCommentPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final publicBlockFromCommentParams = request.publicBlockFromCommentParams;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -66,8 +70,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<BlockSuccess?> blockFromCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, { String? sso, }) async {
-    final response = await blockFromCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams,  sso: sso, );
+  Future<BlockSuccess?> blockFromCommentPublic(ApiBlockFromCommentPublicRequest request,) async {
+    final response = await blockFromCommentPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -90,7 +94,10 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<Response> checkedCommentsForBlockedWithHttpInfo(String tenantId, String commentIds, { String? sso, }) async {
+  Future<Response> checkedCommentsForBlockedWithHttpInfo(ApiCheckedCommentsForBlockedRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentIds = request.commentIds;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/check-blocked-comments';
 
@@ -129,8 +136,8 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(String tenantId, String commentIds, { String? sso, }) async {
-    final response = await checkedCommentsForBlockedWithHttpInfo(tenantId, commentIds,  sso: sso, );
+  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(ApiCheckedCommentsForBlockedRequest request,) async {
+    final response = await checkedCommentsForBlockedWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -158,7 +165,13 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> createCommentPublicWithHttpInfo(String tenantId, String urlId, String broadcastId, CommentData commentData, { String? sessionId, String? sso, }) async {
+  Future<Response> createCommentPublicWithHttpInfo(ApiCreateCommentPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final broadcastId = request.broadcastId;
+    final commentData = request.commentData;
+    final sessionId = request.sessionId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -206,8 +219,8 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<SaveCommentsResponseWithPresence?> createCommentPublic(String tenantId, String urlId, String broadcastId, CommentData commentData, { String? sessionId, String? sso, }) async {
-    final response = await createCommentPublicWithHttpInfo(tenantId, urlId, broadcastId, commentData,  sessionId: sessionId, sso: sso, );
+  Future<SaveCommentsResponseWithPresence?> createCommentPublic(ApiCreateCommentPublicRequest request,) async {
+    final response = await createCommentPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -231,7 +244,11 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> createFeedPostPublicWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, { String? broadcastId, String? sso, }) async {
+  Future<Response> createFeedPostPublicWithHttpInfo(ApiCreateFeedPostPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final createFeedPostParams = request.createFeedPostParams;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -273,8 +290,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> createFeedPostPublic(String tenantId, CreateFeedPostParams createFeedPostParams, { String? broadcastId, String? sso, }) async {
-    final response = await createFeedPostPublicWithHttpInfo(tenantId, createFeedPostParams,  broadcastId: broadcastId, sso: sso, );
+  Future<CreateFeedPostResponse?> createFeedPostPublic(ApiCreateFeedPostPublicRequest request,) async {
+    final response = await createFeedPostPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -296,7 +313,10 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<Response> createV1PageReactWithHttpInfo(String tenantId, String urlId, { String? title, }) async {
+  Future<Response> createV1PageReactWithHttpInfo(ApiCreateV1PageReactRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final title = request.title;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -334,8 +354,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV1PageReact(String tenantId, String urlId, { String? title, }) async {
-    final response = await createV1PageReactWithHttpInfo(tenantId, urlId,  title: title, );
+  Future<CreateV1PageReact?> createV1PageReact(ApiCreateV1PageReactRequest request,) async {
+    final response = await createV1PageReactWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -359,7 +379,11 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<Response> createV2PageReactWithHttpInfo(String tenantId, String urlId, String id, { String? title, }) async {
+  Future<Response> createV2PageReactWithHttpInfo(ApiCreateV2PageReactRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final id = request.id;
+    final title = request.title;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -400,8 +424,8 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV2PageReact(String tenantId, String urlId, String id, { String? title, }) async {
-    final response = await createV2PageReactWithHttpInfo(tenantId, urlId, id,  title: title, );
+  Future<CreateV1PageReact?> createV2PageReact(ApiCreateV2PageReactRequest request,) async {
+    final response = await createV2PageReactWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -427,7 +451,12 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentPublicWithHttpInfo(String tenantId, String commentId, String broadcastId, { String? editKey, String? sso, }) async {
+  Future<Response> deleteCommentPublicWithHttpInfo(ApiDeleteCommentPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final broadcastId = request.broadcastId;
+    final editKey = request.editKey;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}'
       .replaceAll('{tenantId}', tenantId)
@@ -473,8 +502,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(String tenantId, String commentId, String broadcastId, { String? editKey, String? sso, }) async {
-    final response = await deleteCommentPublicWithHttpInfo(tenantId, commentId, broadcastId,  editKey: editKey, sso: sso, );
+  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(ApiDeleteCommentPublicRequest request,) async {
+    final response = await deleteCommentPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -504,7 +533,14 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentVoteWithHttpInfo(String tenantId, String commentId, String voteId, String urlId, String broadcastId, { String? editKey, String? sso, }) async {
+  Future<Response> deleteCommentVoteWithHttpInfo(ApiDeleteCommentVoteRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final voteId = request.voteId;
+    final urlId = request.urlId;
+    final broadcastId = request.broadcastId;
+    final editKey = request.editKey;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/vote/{voteId}'
       .replaceAll('{tenantId}', tenantId)
@@ -556,8 +592,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteCommentVote(String tenantId, String commentId, String voteId, String urlId, String broadcastId, { String? editKey, String? sso, }) async {
-    final response = await deleteCommentVoteWithHttpInfo(tenantId, commentId, voteId, urlId, broadcastId,  editKey: editKey, sso: sso, );
+  Future<VoteDeleteResponse?> deleteCommentVote(ApiDeleteCommentVoteRequest request,) async {
+    final response = await deleteCommentVoteWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -581,7 +617,11 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteFeedPostPublicWithHttpInfo(String tenantId, String postId, { String? broadcastId, String? sso, }) async {
+  Future<Response> deleteFeedPostPublicWithHttpInfo(ApiDeleteFeedPostPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final postId = request.postId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/{postId}'
       .replaceAll('{tenantId}', tenantId)
@@ -624,8 +664,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(String tenantId, String postId, { String? broadcastId, String? sso, }) async {
-    final response = await deleteFeedPostPublicWithHttpInfo(tenantId, postId,  broadcastId: broadcastId, sso: sso, );
+  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(ApiDeleteFeedPostPublicRequest request,) async {
+    final response = await deleteFeedPostPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -645,7 +685,9 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> deleteV1PageReactWithHttpInfo(String tenantId, String urlId,) async {
+  Future<Response> deleteV1PageReactWithHttpInfo(ApiDeleteV1PageReactRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -678,8 +720,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<CreateV1PageReact?> deleteV1PageReact(String tenantId, String urlId,) async {
-    final response = await deleteV1PageReactWithHttpInfo(tenantId, urlId,);
+  Future<CreateV1PageReact?> deleteV1PageReact(ApiDeleteV1PageReactRequest request,) async {
+    final response = await deleteV1PageReactWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -701,7 +743,10 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteV2PageReactWithHttpInfo(String tenantId, String urlId, String id,) async {
+  Future<Response> deleteV2PageReactWithHttpInfo(ApiDeleteV2PageReactRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -737,8 +782,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<CreateV1PageReact?> deleteV2PageReact(String tenantId, String urlId, String id,) async {
-    final response = await deleteV2PageReactWithHttpInfo(tenantId, urlId, id,);
+  Future<CreateV1PageReact?> deleteV2PageReact(ApiDeleteV2PageReactRequest request,) async {
+    final response = await deleteV2PageReactWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -762,7 +807,11 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<Response> flagCommentPublicWithHttpInfo(String tenantId, String commentId, bool isFlagged, { String? sso, }) async {
+  Future<Response> flagCommentPublicWithHttpInfo(ApiFlagCommentPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final isFlagged = request.isFlagged;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -803,8 +852,8 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> flagCommentPublic(String tenantId, String commentId, bool isFlagged, { String? sso, }) async {
-    final response = await flagCommentPublicWithHttpInfo(tenantId, commentId, isFlagged,  sso: sso, );
+  Future<APIEmptyResponse?> flagCommentPublic(ApiFlagCommentPublicRequest request,) async {
+    final response = await flagCommentPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -828,7 +877,11 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> getCommentTextWithHttpInfo(String tenantId, String commentId, { String? editKey, String? sso, }) async {
+  Future<Response> getCommentTextWithHttpInfo(ApiGetCommentTextRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final editKey = request.editKey;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/text'
       .replaceAll('{tenantId}', tenantId)
@@ -871,8 +924,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIGetCommentTextResponse?> getCommentText(String tenantId, String commentId, { String? editKey, String? sso, }) async {
-    final response = await getCommentTextWithHttpInfo(tenantId, commentId,  editKey: editKey, sso: sso, );
+  Future<PublicAPIGetCommentTextResponse?> getCommentText(ApiGetCommentTextRequest request,) async {
+    final response = await getCommentTextWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -896,7 +949,11 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<Response> getCommentVoteUserNamesWithHttpInfo(String tenantId, String commentId, int dir, { String? sso, }) async {
+  Future<Response> getCommentVoteUserNamesWithHttpInfo(ApiGetCommentVoteUserNamesRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final dir = request.dir;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/votes'
       .replaceAll('{tenantId}', tenantId)
@@ -937,8 +994,8 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(String tenantId, String commentId, int dir, { String? sso, }) async {
-    final response = await getCommentVoteUserNamesWithHttpInfo(tenantId, commentId, dir,  sso: sso, );
+  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(ApiGetCommentVoteUserNamesRequest request,) async {
+    final response = await getCommentVoteUserNamesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -968,7 +1025,14 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<Response> getCommentsForUserWithHttpInfo({ String? userId, SortDirections? direction, String? repliesToUserId, double? page, bool? includei10n, String? locale, bool? isCrawler, }) async {
+  Future<Response> getCommentsForUserWithHttpInfo(ApiGetCommentsForUserRequest request,) async {
+    final userId = request.userId;
+    final direction = request.direction;
+    final repliesToUserId = request.repliesToUserId;
+    final page = request.page;
+    final includei10n = request.includei10n;
+    final locale = request.locale;
+    final isCrawler = request.isCrawler;
     // ignore: prefer_const_declarations
     final path = r'/comments-for-user';
 
@@ -1030,8 +1094,8 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<GetCommentsForUserResponse?> getCommentsForUser({ String? userId, SortDirections? direction, String? repliesToUserId, double? page, bool? includei10n, String? locale, bool? isCrawler, }) async {
-    final response = await getCommentsForUserWithHttpInfo( userId: userId, direction: direction, repliesToUserId: repliesToUserId, page: page, includei10n: includei10n, locale: locale, isCrawler: isCrawler, );
+  Future<GetCommentsForUserResponse?> getCommentsForUser(ApiGetCommentsForUserRequest request,) async {
+    final response = await getCommentsForUserWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1106,7 +1170,35 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<Response> getCommentsPublicWithHttpInfo(String tenantId, String urlId, { int? page, SortDirections? direction, String? sso, int? skip, int? skipChildren, int? limit, int? limitChildren, bool? countChildren, String? fetchPageForCommentId, bool? includeConfig, bool? countAll, bool? includei10n, String? locale, String? modules, bool? isCrawler, bool? includeNotificationCount, bool? asTree, int? maxTreeDepth, bool? useFullTranslationIds, String? parentId, String? searchText, List<String>? hashTags, String? userId, String? customConfigStr, String? afterCommentId, String? beforeCommentId, }) async {
+  Future<Response> getCommentsPublicWithHttpInfo(ApiGetCommentsPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final page = request.page;
+    final direction = request.direction;
+    final sso = request.sso;
+    final skip = request.skip;
+    final skipChildren = request.skipChildren;
+    final limit = request.limit;
+    final limitChildren = request.limitChildren;
+    final countChildren = request.countChildren;
+    final fetchPageForCommentId = request.fetchPageForCommentId;
+    final includeConfig = request.includeConfig;
+    final countAll = request.countAll;
+    final includei10n = request.includei10n;
+    final locale = request.locale;
+    final modules = request.modules;
+    final isCrawler = request.isCrawler;
+    final includeNotificationCount = request.includeNotificationCount;
+    final asTree = request.asTree;
+    final maxTreeDepth = request.maxTreeDepth;
+    final useFullTranslationIds = request.useFullTranslationIds;
+    final parentId = request.parentId;
+    final searchText = request.searchText;
+    final hashTags = request.hashTags;
+    final userId = request.userId;
+    final customConfigStr = request.customConfigStr;
+    final afterCommentId = request.afterCommentId;
+    final beforeCommentId = request.beforeCommentId;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1271,8 +1363,8 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(String tenantId, String urlId, { int? page, SortDirections? direction, String? sso, int? skip, int? skipChildren, int? limit, int? limitChildren, bool? countChildren, String? fetchPageForCommentId, bool? includeConfig, bool? countAll, bool? includei10n, String? locale, String? modules, bool? isCrawler, bool? includeNotificationCount, bool? asTree, int? maxTreeDepth, bool? useFullTranslationIds, String? parentId, String? searchText, List<String>? hashTags, String? userId, String? customConfigStr, String? afterCommentId, String? beforeCommentId, }) async {
-    final response = await getCommentsPublicWithHttpInfo(tenantId, urlId,  page: page, direction: direction, sso: sso, skip: skip, skipChildren: skipChildren, limit: limit, limitChildren: limitChildren, countChildren: countChildren, fetchPageForCommentId: fetchPageForCommentId, includeConfig: includeConfig, countAll: countAll, includei10n: includei10n, locale: locale, modules: modules, isCrawler: isCrawler, includeNotificationCount: includeNotificationCount, asTree: asTree, maxTreeDepth: maxTreeDepth, useFullTranslationIds: useFullTranslationIds, parentId: parentId, searchText: searchText, hashTags: hashTags, userId: userId, customConfigStr: customConfigStr, afterCommentId: afterCommentId, beforeCommentId: beforeCommentId, );
+  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(ApiGetCommentsPublicRequest request,) async {
+    final response = await getCommentsPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1301,7 +1393,12 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, { int? endTime, }) async {
+  Future<Response> getEventLogWithHttpInfo(ApiGetEventLogRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final userIdWS = request.userIdWS;
+    final startTime = request.startTime;
+    final endTime = request.endTime;
     // ignore: prefer_const_declarations
     final path = r'/event-log/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1347,8 +1444,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getEventLog(String tenantId, String urlId, String userIdWS, int startTime, { int? endTime, }) async {
-    final response = await getEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime,  endTime: endTime, );
+  Future<GetEventLogResponse?> getEventLog(ApiGetEventLogRequest request,) async {
+    final response = await getEventLogWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1381,7 +1478,14 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<Response> getFeedPostsPublicWithHttpInfo(String tenantId, { String? afterId, int? limit, List<String>? tags, String? sso, bool? isCrawler, bool? includeUserInfo, }) async {
+  Future<Response> getFeedPostsPublicWithHttpInfo(ApiGetFeedPostsPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final afterId = request.afterId;
+    final limit = request.limit;
+    final tags = request.tags;
+    final sso = request.sso;
+    final isCrawler = request.isCrawler;
+    final includeUserInfo = request.includeUserInfo;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1443,8 +1547,8 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<PublicFeedPostsResponse?> getFeedPostsPublic(String tenantId, { String? afterId, int? limit, List<String>? tags, String? sso, bool? isCrawler, bool? includeUserInfo, }) async {
-    final response = await getFeedPostsPublicWithHttpInfo(tenantId,  afterId: afterId, limit: limit, tags: tags, sso: sso, isCrawler: isCrawler, includeUserInfo: includeUserInfo, );
+  Future<PublicFeedPostsResponse?> getFeedPostsPublic(ApiGetFeedPostsPublicRequest request,) async {
+    final response = await getFeedPostsPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1466,7 +1570,10 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<Response> getFeedPostsStatsWithHttpInfo(String tenantId, List<String> postIds, { String? sso, }) async {
+  Future<Response> getFeedPostsStatsWithHttpInfo(ApiGetFeedPostsStatsRequest request,) async {
+    final tenantId = request.tenantId;
+    final postIds = request.postIds;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/stats'
       .replaceAll('{tenantId}', tenantId);
@@ -1504,8 +1611,8 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<FeedPostsStatsResponse?> getFeedPostsStats(String tenantId, List<String> postIds, { String? sso, }) async {
-    final response = await getFeedPostsStatsWithHttpInfo(tenantId, postIds,  sso: sso, );
+  Future<FeedPostsStatsResponse?> getFeedPostsStats(ApiGetFeedPostsStatsRequest request,) async {
+    final response = await getFeedPostsStatsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1525,7 +1632,9 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] largeInternalURLSanitized (required):
-  Future<Response> getGifLargeWithHttpInfo(String tenantId, String largeInternalURLSanitized,) async {
+  Future<Response> getGifLargeWithHttpInfo(ApiGetGifLargeRequest request,) async {
+    final tenantId = request.tenantId;
+    final largeInternalURLSanitized = request.largeInternalURLSanitized;
     // ignore: prefer_const_declarations
     final path = r'/gifs/get-large/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1558,8 +1667,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] largeInternalURLSanitized (required):
-  Future<GifGetLargeResponse?> getGifLarge(String tenantId, String largeInternalURLSanitized,) async {
-    final response = await getGifLargeWithHttpInfo(tenantId, largeInternalURLSanitized,);
+  Future<GifGetLargeResponse?> getGifLarge(ApiGetGifLargeRequest request,) async {
+    final response = await getGifLargeWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1585,7 +1694,12 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsSearchWithHttpInfo(String tenantId, String search, { String? locale, String? rating, double? page, }) async {
+  Future<Response> getGifsSearchWithHttpInfo(ApiGetGifsSearchRequest request,) async {
+    final tenantId = request.tenantId;
+    final search = request.search;
+    final locale = request.locale;
+    final rating = request.rating;
+    final page = request.page;
     // ignore: prefer_const_declarations
     final path = r'/gifs/search/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1633,8 +1747,8 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsSearchResponse?> getGifsSearch(String tenantId, String search, { String? locale, String? rating, double? page, }) async {
-    final response = await getGifsSearchWithHttpInfo(tenantId, search,  locale: locale, rating: rating, page: page, );
+  Future<GetGifsSearchResponse?> getGifsSearch(ApiGetGifsSearchRequest request,) async {
+    final response = await getGifsSearchWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1658,7 +1772,11 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsTrendingWithHttpInfo(String tenantId, { String? locale, String? rating, double? page, }) async {
+  Future<Response> getGifsTrendingWithHttpInfo(ApiGetGifsTrendingRequest request,) async {
+    final tenantId = request.tenantId;
+    final locale = request.locale;
+    final rating = request.rating;
+    final page = request.page;
     // ignore: prefer_const_declarations
     final path = r'/gifs/trending/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1703,8 +1821,8 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsTrendingResponse?> getGifsTrending(String tenantId, { String? locale, String? rating, double? page, }) async {
-    final response = await getGifsTrendingWithHttpInfo(tenantId,  locale: locale, rating: rating, page: page, );
+  Future<GetGifsTrendingResponse?> getGifsTrending(ApiGetGifsTrendingRequest request,) async {
+    final response = await getGifsTrendingWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1733,7 +1851,12 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getGlobalEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, { int? endTime, }) async {
+  Future<Response> getGlobalEventLogWithHttpInfo(ApiGetGlobalEventLogRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final userIdWS = request.userIdWS;
+    final startTime = request.startTime;
+    final endTime = request.endTime;
     // ignore: prefer_const_declarations
     final path = r'/event-log/global/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1779,8 +1902,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getGlobalEventLog(String tenantId, String urlId, String userIdWS, int startTime, { int? endTime, }) async {
-    final response = await getGlobalEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime,  endTime: endTime, );
+  Future<GetEventLogResponse?> getGlobalEventLog(ApiGetGlobalEventLogRequest request,) async {
+    final response = await getGlobalEventLogWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1810,7 +1933,11 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOfflineUsersWithHttpInfo(String tenantId, String urlId, { String? afterName, String? afterUserId, }) async {
+  Future<Response> getOfflineUsersWithHttpInfo(ApiGetOfflineUsersRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final afterName = request.afterName;
+    final afterUserId = request.afterUserId;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/offline'
       .replaceAll('{tenantId}', tenantId);
@@ -1858,8 +1985,8 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOfflineResponse?> getOfflineUsers(String tenantId, String urlId, { String? afterName, String? afterUserId, }) async {
-    final response = await getOfflineUsersWithHttpInfo(tenantId, urlId,  afterName: afterName, afterUserId: afterUserId, );
+  Future<PageUsersOfflineResponse?> getOfflineUsers(ApiGetOfflineUsersRequest request,) async {
+    final response = await getOfflineUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1889,7 +2016,11 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOnlineUsersWithHttpInfo(String tenantId, String urlId, { String? afterName, String? afterUserId, }) async {
+  Future<Response> getOnlineUsersWithHttpInfo(ApiGetOnlineUsersRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final afterName = request.afterName;
+    final afterUserId = request.afterUserId;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/online'
       .replaceAll('{tenantId}', tenantId);
@@ -1937,8 +2068,8 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOnlineResponse?> getOnlineUsers(String tenantId, String urlId, { String? afterName, String? afterUserId, }) async {
-    final response = await getOnlineUsersWithHttpInfo(tenantId, urlId,  afterName: afterName, afterUserId: afterUserId, );
+  Future<PageUsersOnlineResponse?> getOnlineUsers(ApiGetOnlineUsersRequest request,) async {
+    final response = await getOnlineUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1974,7 +2105,13 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<Response> getPagesPublicWithHttpInfo(String tenantId, { String? cursor, int? limit, String? q, PagesSortBy? sortBy, bool? hasComments, }) async {
+  Future<Response> getPagesPublicWithHttpInfo(ApiGetPagesPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final cursor = request.cursor;
+    final limit = request.limit;
+    final q = request.q;
+    final sortBy = request.sortBy;
+    final hasComments = request.hasComments;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2036,8 +2173,8 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<GetPublicPagesResponse?> getPagesPublic(String tenantId, { String? cursor, int? limit, String? q, PagesSortBy? sortBy, bool? hasComments, }) async {
-    final response = await getPagesPublicWithHttpInfo(tenantId,  cursor: cursor, limit: limit, q: q, sortBy: sortBy, hasComments: hasComments, );
+  Future<GetPublicPagesResponse?> getPagesPublic(ApiGetPagesPublicRequest request,) async {
+    final response = await getPagesPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2061,7 +2198,11 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<Response> getTranslationsWithHttpInfo(String namespace, String component, { String? locale, bool? useFullTranslationIds, }) async {
+  Future<Response> getTranslationsWithHttpInfo(ApiGetTranslationsRequest request,) async {
+    final namespace = request.namespace;
+    final component = request.component;
+    final locale = request.locale;
+    final useFullTranslationIds = request.useFullTranslationIds;
     // ignore: prefer_const_declarations
     final path = r'/translations/{namespace}/{component}'
       .replaceAll('{namespace}', namespace)
@@ -2104,8 +2245,8 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<GetTranslationsResponse?> getTranslations(String namespace, String component, { String? locale, bool? useFullTranslationIds, }) async {
-    final response = await getTranslationsWithHttpInfo(namespace, component,  locale: locale, useFullTranslationIds: useFullTranslationIds, );
+  Future<GetTranslationsResponse?> getTranslations(ApiGetTranslationsRequest request,) async {
+    final response = await getTranslationsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2125,7 +2266,9 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationCountWithHttpInfo(String tenantId, { String? sso, }) async {
+  Future<Response> getUserNotificationCountWithHttpInfo(ApiGetUserNotificationCountRequest request,) async {
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/get-count';
 
@@ -2160,8 +2303,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<GetUserNotificationCountResponse?> getUserNotificationCount(String tenantId, { String? sso, }) async {
-    final response = await getUserNotificationCountWithHttpInfo(tenantId,  sso: sso, );
+  Future<GetUserNotificationCountResponse?> getUserNotificationCount(ApiGetUserNotificationCountRequest request,) async {
+    final response = await getUserNotificationCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2202,7 +2345,19 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationsWithHttpInfo(String tenantId, { String? urlId, int? pageSize, String? afterId, bool? includeContext, int? afterCreatedAt, bool? unreadOnly, bool? dmOnly, bool? noDm, bool? includeTranslations, bool? includeTenantNotifications, String? sso, }) async {
+  Future<Response> getUserNotificationsWithHttpInfo(ApiGetUserNotificationsRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final pageSize = request.pageSize;
+    final afterId = request.afterId;
+    final includeContext = request.includeContext;
+    final afterCreatedAt = request.afterCreatedAt;
+    final unreadOnly = request.unreadOnly;
+    final dmOnly = request.dmOnly;
+    final noDm = request.noDm;
+    final includeTranslations = request.includeTranslations;
+    final includeTenantNotifications = request.includeTenantNotifications;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications';
 
@@ -2288,8 +2443,8 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<GetMyNotificationsResponse?> getUserNotifications(String tenantId, { String? urlId, int? pageSize, String? afterId, bool? includeContext, int? afterCreatedAt, bool? unreadOnly, bool? dmOnly, bool? noDm, bool? includeTranslations, bool? includeTenantNotifications, String? sso, }) async {
-    final response = await getUserNotificationsWithHttpInfo(tenantId,  urlId: urlId, pageSize: pageSize, afterId: afterId, includeContext: includeContext, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, includeTranslations: includeTranslations, includeTenantNotifications: includeTenantNotifications, sso: sso, );
+  Future<GetMyNotificationsResponse?> getUserNotifications(ApiGetUserNotificationsRequest request,) async {
+    final response = await getUserNotificationsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2311,7 +2466,10 @@ class PublicApi {
   /// * [String] urlIdWS (required):
   ///
   /// * [String] userIds (required):
-  Future<Response> getUserPresenceStatusesWithHttpInfo(String tenantId, String urlIdWS, String userIds,) async {
+  Future<Response> getUserPresenceStatusesWithHttpInfo(ApiGetUserPresenceStatusesRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlIdWS = request.urlIdWS;
+    final userIds = request.userIds;
     // ignore: prefer_const_declarations
     final path = r'/user-presence-status';
 
@@ -2347,8 +2505,8 @@ class PublicApi {
   /// * [String] urlIdWS (required):
   ///
   /// * [String] userIds (required):
-  Future<GetUserPresenceStatusesResponse?> getUserPresenceStatuses(String tenantId, String urlIdWS, String userIds,) async {
-    final response = await getUserPresenceStatusesWithHttpInfo(tenantId, urlIdWS, userIds,);
+  Future<GetUserPresenceStatusesResponse?> getUserPresenceStatuses(ApiGetUserPresenceStatusesRequest request,) async {
+    final response = await getUserPresenceStatusesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2370,7 +2528,10 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<Response> getUserReactsPublicWithHttpInfo(String tenantId, { List<String>? postIds, String? sso, }) async {
+  Future<Response> getUserReactsPublicWithHttpInfo(ApiGetUserReactsPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final postIds = request.postIds;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/user-reacts'
       .replaceAll('{tenantId}', tenantId);
@@ -2410,8 +2571,8 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<UserReactsResponse?> getUserReactsPublic(String tenantId, { List<String>? postIds, String? sso, }) async {
-    final response = await getUserReactsPublicWithHttpInfo(tenantId,  postIds: postIds, sso: sso, );
+  Future<UserReactsResponse?> getUserReactsPublic(ApiGetUserReactsPublicRequest request,) async {
+    final response = await getUserReactsPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2435,7 +2596,9 @@ class PublicApi {
   ///
   /// * [String] ids (required):
   ///   Comma-delimited userIds.
-  Future<Response> getUsersInfoWithHttpInfo(String tenantId, String ids,) async {
+  Future<Response> getUsersInfoWithHttpInfo(ApiGetUsersInfoRequest request,) async {
+    final tenantId = request.tenantId;
+    final ids = request.ids;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/info'
       .replaceAll('{tenantId}', tenantId);
@@ -2471,8 +2634,8 @@ class PublicApi {
   ///
   /// * [String] ids (required):
   ///   Comma-delimited userIds.
-  Future<PageUsersInfoResponse?> getUsersInfo(String tenantId, String ids,) async {
-    final response = await getUsersInfoWithHttpInfo(tenantId, ids,);
+  Future<PageUsersInfoResponse?> getUsersInfo(ApiGetUsersInfoRequest request,) async {
+    final response = await getUsersInfoWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2492,7 +2655,9 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getV1PageLikesWithHttpInfo(String tenantId, String urlId,) async {
+  Future<Response> getV1PageLikesWithHttpInfo(ApiGetV1PageLikesRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2525,8 +2690,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetV1PageLikes?> getV1PageLikes(String tenantId, String urlId,) async {
-    final response = await getV1PageLikesWithHttpInfo(tenantId, urlId,);
+  Future<GetV1PageLikes?> getV1PageLikes(ApiGetV1PageLikesRequest request,) async {
+    final response = await getV1PageLikesWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2548,7 +2713,10 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getV2PageReactUsersWithHttpInfo(String tenantId, String urlId, String id,) async {
+  Future<Response> getV2PageReactUsersWithHttpInfo(ApiGetV2PageReactUsersRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final id = request.id;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}/list'
       .replaceAll('{tenantId}', tenantId);
@@ -2584,8 +2752,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<GetV2PageReactUsersResponse?> getV2PageReactUsers(String tenantId, String urlId, String id,) async {
-    final response = await getV2PageReactUsersWithHttpInfo(tenantId, urlId, id,);
+  Future<GetV2PageReactUsersResponse?> getV2PageReactUsers(ApiGetV2PageReactUsersRequest request,) async {
+    final response = await getV2PageReactUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2605,7 +2773,9 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getV2PageReactsWithHttpInfo(String tenantId, String urlId,) async {
+  Future<Response> getV2PageReactsWithHttpInfo(ApiGetV2PageReactsRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2638,8 +2808,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetV2PageReacts?> getV2PageReacts(String tenantId, String urlId,) async {
-    final response = await getV2PageReactsWithHttpInfo(tenantId, urlId,);
+  Future<GetV2PageReacts?> getV2PageReacts(ApiGetV2PageReactsRequest request,) async {
+    final response = await getV2PageReactsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2663,7 +2833,11 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> lockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
+  Future<Response> lockCommentWithHttpInfo(ApiLockCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/lock'
       .replaceAll('{tenantId}', tenantId)
@@ -2704,8 +2878,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> lockComment(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
-    final response = await lockCommentWithHttpInfo(tenantId, commentId, broadcastId,  sso: sso, );
+  Future<APIEmptyResponse?> lockComment(ApiLockCommentRequest request,) async {
+    final response = await lockCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2720,7 +2894,7 @@ class PublicApi {
   }
 
   /// Performs an HTTP 'PUT /auth/logout' operation and returns the [Response].
-  Future<Response> logoutPublicWithHttpInfo() async {
+  Future<Response> logoutPublicWithHttpInfo(ApiLogoutPublicRequest request,) async {
     // ignore: prefer_const_declarations
     final path = r'/auth/logout';
 
@@ -2745,8 +2919,8 @@ class PublicApi {
     );
   }
 
-  Future<APIEmptyResponse?> logoutPublic() async {
-    final response = await logoutPublicWithHttpInfo();
+  Future<APIEmptyResponse?> logoutPublic(ApiLogoutPublicRequest request,) async {
+    final response = await logoutPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2770,7 +2944,11 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> pinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
+  Future<Response> pinCommentWithHttpInfo(ApiPinCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/pin'
       .replaceAll('{tenantId}', tenantId)
@@ -2811,8 +2989,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> pinComment(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
-    final response = await pinCommentWithHttpInfo(tenantId, commentId, broadcastId,  sso: sso, );
+  Future<ChangeCommentPinStatusResponse?> pinComment(ApiPinCommentRequest request,) async {
+    final response = await pinCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2840,7 +3018,13 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> reactFeedPostPublicWithHttpInfo(String tenantId, String postId, ReactBodyParams reactBodyParams, { bool? isUndo, String? broadcastId, String? sso, }) async {
+  Future<Response> reactFeedPostPublicWithHttpInfo(ApiReactFeedPostPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final postId = request.postId;
+    final reactBodyParams = request.reactBodyParams;
+    final isUndo = request.isUndo;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/react/{postId}'
       .replaceAll('{tenantId}', tenantId)
@@ -2890,8 +3074,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<ReactFeedPostResponse?> reactFeedPostPublic(String tenantId, String postId, ReactBodyParams reactBodyParams, { bool? isUndo, String? broadcastId, String? sso, }) async {
-    final response = await reactFeedPostPublicWithHttpInfo(tenantId, postId, reactBodyParams,  isUndo: isUndo, broadcastId: broadcastId, sso: sso, );
+  Future<ReactFeedPostResponse?> reactFeedPostPublic(ApiReactFeedPostPublicRequest request,) async {
+    final response = await reactFeedPostPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2911,7 +3095,9 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationCountWithHttpInfo(String tenantId, { String? sso, }) async {
+  Future<Response> resetUserNotificationCountWithHttpInfo(ApiResetUserNotificationCountRequest request,) async {
+    final tenantId = request.tenantId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/reset-count';
 
@@ -2946,8 +3132,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(String tenantId, { String? sso, }) async {
-    final response = await resetUserNotificationCountWithHttpInfo(tenantId,  sso: sso, );
+  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(ApiResetUserNotificationCountRequest request,) async {
+    final response = await resetUserNotificationCountWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2977,7 +3163,14 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationsWithHttpInfo(String tenantId, { String? afterId, int? afterCreatedAt, bool? unreadOnly, bool? dmOnly, bool? noDm, String? sso, }) async {
+  Future<Response> resetUserNotificationsWithHttpInfo(ApiResetUserNotificationsRequest request,) async {
+    final tenantId = request.tenantId;
+    final afterId = request.afterId;
+    final afterCreatedAt = request.afterCreatedAt;
+    final unreadOnly = request.unreadOnly;
+    final dmOnly = request.dmOnly;
+    final noDm = request.noDm;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/reset';
 
@@ -3037,8 +3230,8 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotifications(String tenantId, { String? afterId, int? afterCreatedAt, bool? unreadOnly, bool? dmOnly, bool? noDm, String? sso, }) async {
-    final response = await resetUserNotificationsWithHttpInfo(tenantId,  afterId: afterId, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, sso: sso, );
+  Future<ResetUserNotificationsResponse?> resetUserNotifications(ApiResetUserNotificationsRequest request,) async {
+    final response = await resetUserNotificationsWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3066,7 +3259,13 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<Response> searchUsersWithHttpInfo(String tenantId, String urlId, { String? usernameStartsWith, List<String>? mentionGroupIds, String? sso, String? searchSection, }) async {
+  Future<Response> searchUsersWithHttpInfo(ApiSearchUsersRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final usernameStartsWith = request.usernameStartsWith;
+    final mentionGroupIds = request.mentionGroupIds;
+    final sso = request.sso;
+    final searchSection = request.searchSection;
     // ignore: prefer_const_declarations
     final path = r'/user-search/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -3119,8 +3318,8 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<SearchUsersResult?> searchUsers(String tenantId, String urlId, { String? usernameStartsWith, List<String>? mentionGroupIds, String? sso, String? searchSection, }) async {
-    final response = await searchUsersWithHttpInfo(tenantId, urlId,  usernameStartsWith: usernameStartsWith, mentionGroupIds: mentionGroupIds, sso: sso, searchSection: searchSection, );
+  Future<SearchUsersResult?> searchUsers(ApiSearchUsersRequest request,) async {
+    final response = await searchUsersWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3148,7 +3347,13 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> setCommentTextWithHttpInfo(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, { String? editKey, String? sso, }) async {
+  Future<Response> setCommentTextWithHttpInfo(ApiSetCommentTextRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final broadcastId = request.broadcastId;
+    final commentTextUpdateRequest = request.commentTextUpdateRequest;
+    final editKey = request.editKey;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/update-text'
       .replaceAll('{tenantId}', tenantId)
@@ -3196,8 +3401,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPISetCommentTextResponse?> setCommentText(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, { String? editKey, String? sso, }) async {
-    final response = await setCommentTextWithHttpInfo(tenantId, commentId, broadcastId, commentTextUpdateRequest,  editKey: editKey, sso: sso, );
+  Future<PublicAPISetCommentTextResponse?> setCommentText(ApiSetCommentTextRequest request,) async {
+    final response = await setCommentTextWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3221,7 +3426,11 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> unBlockCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, { String? sso, }) async {
+  Future<Response> unBlockCommentPublicWithHttpInfo(ApiUnBlockCommentPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final publicBlockFromCommentParams = request.publicBlockFromCommentParams;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -3261,8 +3470,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<UnblockSuccess?> unBlockCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, { String? sso, }) async {
-    final response = await unBlockCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams,  sso: sso, );
+  Future<UnblockSuccess?> unBlockCommentPublic(ApiUnBlockCommentPublicRequest request,) async {
+    final response = await unBlockCommentPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3286,7 +3495,11 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unLockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
+  Future<Response> unLockCommentWithHttpInfo(ApiUnLockCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unlock'
       .replaceAll('{tenantId}', tenantId)
@@ -3327,8 +3540,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> unLockComment(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
-    final response = await unLockCommentWithHttpInfo(tenantId, commentId, broadcastId,  sso: sso, );
+  Future<APIEmptyResponse?> unLockComment(ApiUnLockCommentRequest request,) async {
+    final response = await unLockCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3352,7 +3565,11 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unPinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
+  Future<Response> unPinCommentWithHttpInfo(ApiUnPinCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unpin'
       .replaceAll('{tenantId}', tenantId)
@@ -3393,8 +3610,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> unPinComment(String tenantId, String commentId, String broadcastId, { String? sso, }) async {
-    final response = await unPinCommentWithHttpInfo(tenantId, commentId, broadcastId,  sso: sso, );
+  Future<ChangeCommentPinStatusResponse?> unPinComment(ApiUnPinCommentRequest request,) async {
+    final response = await unPinCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3420,7 +3637,12 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> updateFeedPostPublicWithHttpInfo(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, { String? broadcastId, String? sso, }) async {
+  Future<Response> updateFeedPostPublicWithHttpInfo(ApiUpdateFeedPostPublicRequest request,) async {
+    final tenantId = request.tenantId;
+    final postId = request.postId;
+    final updateFeedPostParams = request.updateFeedPostParams;
+    final broadcastId = request.broadcastId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/{postId}'
       .replaceAll('{tenantId}', tenantId)
@@ -3465,8 +3687,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> updateFeedPostPublic(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, { String? broadcastId, String? sso, }) async {
-    final response = await updateFeedPostPublicWithHttpInfo(tenantId, postId, updateFeedPostParams,  broadcastId: broadcastId, sso: sso, );
+  Future<CreateFeedPostResponse?> updateFeedPostPublic(ApiUpdateFeedPostPublicRequest request,) async {
+    final response = await updateFeedPostPublicWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3495,7 +3717,12 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(String tenantId, String notificationId, String optedInOrOut, String commentId, { String? sso, }) async {
+  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(ApiUpdateUserNotificationCommentSubscriptionStatusRequest request,) async {
+    final tenantId = request.tenantId;
+    final notificationId = request.notificationId;
+    final optedInOrOut = request.optedInOrOut;
+    final commentId = request.commentId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark-opted/{optedInOrOut}'
       .replaceAll('{notificationId}', notificationId)
@@ -3541,8 +3768,8 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(String tenantId, String notificationId, String optedInOrOut, String commentId, { String? sso, }) async {
-    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(tenantId, notificationId, optedInOrOut, commentId,  sso: sso, );
+  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(ApiUpdateUserNotificationCommentSubscriptionStatusRequest request,) async {
+    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3573,7 +3800,13 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, { String? sso, }) async {
+  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(ApiUpdateUserNotificationPageSubscriptionStatusRequest request,) async {
+    final tenantId = request.tenantId;
+    final urlId = request.urlId;
+    final url = request.url;
+    final pageTitle = request.pageTitle;
+    final subscribedOrUnsubscribed = request.subscribedOrUnsubscribed;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/set-subscription-state/{subscribedOrUnsubscribed}'
       .replaceAll('{subscribedOrUnsubscribed}', subscribedOrUnsubscribed);
@@ -3622,8 +3855,8 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, { String? sso, }) async {
-    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed,  sso: sso, );
+  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(ApiUpdateUserNotificationPageSubscriptionStatusRequest request,) async {
+    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3647,7 +3880,11 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationStatusWithHttpInfo(String tenantId, String notificationId, String newStatus, { String? sso, }) async {
+  Future<Response> updateUserNotificationStatusWithHttpInfo(ApiUpdateUserNotificationStatusRequest request,) async {
+    final tenantId = request.tenantId;
+    final notificationId = request.notificationId;
+    final newStatus = request.newStatus;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark/{newStatus}'
       .replaceAll('{notificationId}', notificationId)
@@ -3688,8 +3925,8 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(String tenantId, String notificationId, String newStatus, { String? sso, }) async {
-    final response = await updateUserNotificationStatusWithHttpInfo(tenantId, notificationId, newStatus,  sso: sso, );
+  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(ApiUpdateUserNotificationStatusRequest request,) async {
+    final response = await updateUserNotificationStatusWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3718,7 +3955,11 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<Response> uploadImageWithHttpInfo(String tenantId, MultipartFile file, { SizePreset? sizePreset, String? urlId, }) async {
+  Future<Response> uploadImageWithHttpInfo(ApiUploadImageRequest request,) async {
+    final tenantId = request.tenantId;
+    final file = request.file;
+    final sizePreset = request.sizePreset;
+    final urlId = request.urlId;
     // ignore: prefer_const_declarations
     final path = r'/upload-image/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -3774,8 +4015,8 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<UploadImageResponse?> uploadImage(String tenantId, MultipartFile file, { SizePreset? sizePreset, String? urlId, }) async {
-    final response = await uploadImageWithHttpInfo(tenantId, file,  sizePreset: sizePreset, urlId: urlId, );
+  Future<UploadImageResponse?> uploadImage(ApiUploadImageRequest request,) async {
+    final response = await uploadImageWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3805,7 +4046,14 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> voteCommentWithHttpInfo(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, { String? sessionId, String? sso, }) async {
+  Future<Response> voteCommentWithHttpInfo(ApiVoteCommentRequest request,) async {
+    final tenantId = request.tenantId;
+    final commentId = request.commentId;
+    final urlId = request.urlId;
+    final broadcastId = request.broadcastId;
+    final voteBodyParams = request.voteBodyParams;
+    final sessionId = request.sessionId;
+    final sso = request.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/vote'
       .replaceAll('{tenantId}', tenantId)
@@ -3856,8 +4104,8 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> voteComment(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, { String? sessionId, String? sso, }) async {
-    final response = await voteCommentWithHttpInfo(tenantId, commentId, urlId, broadcastId, voteBodyParams,  sessionId: sessionId, sso: sso, );
+  Future<VoteResponse?> voteComment(ApiVoteCommentRequest request,) async {
+    final response = await voteCommentWithHttpInfo(request,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3871,3 +4119,810 @@ class PublicApi {
     return null;
   }
 }
+
+/// Request parameters for [PublicApi.blockFromCommentPublic].
+class ApiBlockFromCommentPublicRequest {
+  const ApiBlockFromCommentPublicRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.publicBlockFromCommentParams,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final PublicBlockFromCommentParams publicBlockFromCommentParams;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.checkedCommentsForBlocked].
+class ApiCheckedCommentsForBlockedRequest {
+  const ApiCheckedCommentsForBlockedRequest({
+    required this.tenantId,
+    required this.commentIds,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentIds;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.createCommentPublic].
+class ApiCreateCommentPublicRequest {
+  const ApiCreateCommentPublicRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.broadcastId,
+    required this.commentData,
+    this.sessionId,
+    this.sso,
+  });
+  final String tenantId;
+  final String urlId;
+  final String broadcastId;
+  final CommentData commentData;
+  final String? sessionId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.createFeedPostPublic].
+class ApiCreateFeedPostPublicRequest {
+  const ApiCreateFeedPostPublicRequest({
+    required this.tenantId,
+    required this.createFeedPostParams,
+    this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final CreateFeedPostParams createFeedPostParams;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.createV1PageReact].
+class ApiCreateV1PageReactRequest {
+  const ApiCreateV1PageReactRequest({
+    required this.tenantId,
+    required this.urlId,
+    this.title,
+  });
+  final String tenantId;
+  final String urlId;
+  final String? title;
+}
+
+/// Request parameters for [PublicApi.createV2PageReact].
+class ApiCreateV2PageReactRequest {
+  const ApiCreateV2PageReactRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.id,
+    this.title,
+  });
+  final String tenantId;
+  final String urlId;
+  final String id;
+  final String? title;
+}
+
+/// Request parameters for [PublicApi.deleteCommentPublic].
+class ApiDeleteCommentPublicRequest {
+  const ApiDeleteCommentPublicRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.broadcastId,
+    this.editKey,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String broadcastId;
+  final String? editKey;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.deleteCommentVote].
+class ApiDeleteCommentVoteRequest {
+  const ApiDeleteCommentVoteRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.voteId,
+    required this.urlId,
+    required this.broadcastId,
+    this.editKey,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String voteId;
+  final String urlId;
+  final String broadcastId;
+  final String? editKey;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.deleteFeedPostPublic].
+class ApiDeleteFeedPostPublicRequest {
+  const ApiDeleteFeedPostPublicRequest({
+    required this.tenantId,
+    required this.postId,
+    this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String postId;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.deleteV1PageReact].
+class ApiDeleteV1PageReactRequest {
+  const ApiDeleteV1PageReactRequest({
+    required this.tenantId,
+    required this.urlId,
+  });
+  final String tenantId;
+  final String urlId;
+}
+
+/// Request parameters for [PublicApi.deleteV2PageReact].
+class ApiDeleteV2PageReactRequest {
+  const ApiDeleteV2PageReactRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.id,
+  });
+  final String tenantId;
+  final String urlId;
+  final String id;
+}
+
+/// Request parameters for [PublicApi.flagCommentPublic].
+class ApiFlagCommentPublicRequest {
+  const ApiFlagCommentPublicRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.isFlagged,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final bool isFlagged;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getCommentText].
+class ApiGetCommentTextRequest {
+  const ApiGetCommentTextRequest({
+    required this.tenantId,
+    required this.commentId,
+    this.editKey,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String? editKey;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getCommentVoteUserNames].
+class ApiGetCommentVoteUserNamesRequest {
+  const ApiGetCommentVoteUserNamesRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.dir,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final int dir;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getCommentsForUser].
+class ApiGetCommentsForUserRequest {
+  const ApiGetCommentsForUserRequest({
+    this.userId,
+    this.direction,
+    this.repliesToUserId,
+    this.page,
+    this.includei10n,
+    this.locale,
+    this.isCrawler,
+  });
+  final String? userId;
+  final SortDirections? direction;
+  final String? repliesToUserId;
+  final double? page;
+  final bool? includei10n;
+  final String? locale;
+  final bool? isCrawler;
+}
+
+/// Request parameters for [PublicApi.getCommentsPublic].
+class ApiGetCommentsPublicRequest {
+  const ApiGetCommentsPublicRequest({
+    required this.tenantId,
+    required this.urlId,
+    this.page,
+    this.direction,
+    this.sso,
+    this.skip,
+    this.skipChildren,
+    this.limit,
+    this.limitChildren,
+    this.countChildren,
+    this.fetchPageForCommentId,
+    this.includeConfig,
+    this.countAll,
+    this.includei10n,
+    this.locale,
+    this.modules,
+    this.isCrawler,
+    this.includeNotificationCount,
+    this.asTree,
+    this.maxTreeDepth,
+    this.useFullTranslationIds,
+    this.parentId,
+    this.searchText,
+    this.hashTags,
+    this.userId,
+    this.customConfigStr,
+    this.afterCommentId,
+    this.beforeCommentId,
+  });
+  final String tenantId;
+  final String urlId;
+  final int? page;
+  final SortDirections? direction;
+  final String? sso;
+  final int? skip;
+  final int? skipChildren;
+  final int? limit;
+  final int? limitChildren;
+  final bool? countChildren;
+  final String? fetchPageForCommentId;
+  final bool? includeConfig;
+  final bool? countAll;
+  final bool? includei10n;
+  final String? locale;
+  final String? modules;
+  final bool? isCrawler;
+  final bool? includeNotificationCount;
+  final bool? asTree;
+  final int? maxTreeDepth;
+  final bool? useFullTranslationIds;
+  final String? parentId;
+  final String? searchText;
+  final List<String>? hashTags;
+  final String? userId;
+  final String? customConfigStr;
+  final String? afterCommentId;
+  final String? beforeCommentId;
+}
+
+/// Request parameters for [PublicApi.getEventLog].
+class ApiGetEventLogRequest {
+  const ApiGetEventLogRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.userIdWS,
+    required this.startTime,
+    this.endTime,
+  });
+  final String tenantId;
+  final String urlId;
+  final String userIdWS;
+  final int startTime;
+  final int? endTime;
+}
+
+/// Request parameters for [PublicApi.getFeedPostsPublic].
+class ApiGetFeedPostsPublicRequest {
+  const ApiGetFeedPostsPublicRequest({
+    required this.tenantId,
+    this.afterId,
+    this.limit,
+    this.tags,
+    this.sso,
+    this.isCrawler,
+    this.includeUserInfo,
+  });
+  final String tenantId;
+  final String? afterId;
+  final int? limit;
+  final List<String>? tags;
+  final String? sso;
+  final bool? isCrawler;
+  final bool? includeUserInfo;
+}
+
+/// Request parameters for [PublicApi.getFeedPostsStats].
+class ApiGetFeedPostsStatsRequest {
+  const ApiGetFeedPostsStatsRequest({
+    required this.tenantId,
+    required this.postIds,
+    this.sso,
+  });
+  final String tenantId;
+  final List<String> postIds;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getGifLarge].
+class ApiGetGifLargeRequest {
+  const ApiGetGifLargeRequest({
+    required this.tenantId,
+    required this.largeInternalURLSanitized,
+  });
+  final String tenantId;
+  final String largeInternalURLSanitized;
+}
+
+/// Request parameters for [PublicApi.getGifsSearch].
+class ApiGetGifsSearchRequest {
+  const ApiGetGifsSearchRequest({
+    required this.tenantId,
+    required this.search,
+    this.locale,
+    this.rating,
+    this.page,
+  });
+  final String tenantId;
+  final String search;
+  final String? locale;
+  final String? rating;
+  final double? page;
+}
+
+/// Request parameters for [PublicApi.getGifsTrending].
+class ApiGetGifsTrendingRequest {
+  const ApiGetGifsTrendingRequest({
+    required this.tenantId,
+    this.locale,
+    this.rating,
+    this.page,
+  });
+  final String tenantId;
+  final String? locale;
+  final String? rating;
+  final double? page;
+}
+
+/// Request parameters for [PublicApi.getGlobalEventLog].
+class ApiGetGlobalEventLogRequest {
+  const ApiGetGlobalEventLogRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.userIdWS,
+    required this.startTime,
+    this.endTime,
+  });
+  final String tenantId;
+  final String urlId;
+  final String userIdWS;
+  final int startTime;
+  final int? endTime;
+}
+
+/// Request parameters for [PublicApi.getOfflineUsers].
+class ApiGetOfflineUsersRequest {
+  const ApiGetOfflineUsersRequest({
+    required this.tenantId,
+    required this.urlId,
+    this.afterName,
+    this.afterUserId,
+  });
+  final String tenantId;
+  final String urlId;
+  final String? afterName;
+  final String? afterUserId;
+}
+
+/// Request parameters for [PublicApi.getOnlineUsers].
+class ApiGetOnlineUsersRequest {
+  const ApiGetOnlineUsersRequest({
+    required this.tenantId,
+    required this.urlId,
+    this.afterName,
+    this.afterUserId,
+  });
+  final String tenantId;
+  final String urlId;
+  final String? afterName;
+  final String? afterUserId;
+}
+
+/// Request parameters for [PublicApi.getPagesPublic].
+class ApiGetPagesPublicRequest {
+  const ApiGetPagesPublicRequest({
+    required this.tenantId,
+    this.cursor,
+    this.limit,
+    this.q,
+    this.sortBy,
+    this.hasComments,
+  });
+  final String tenantId;
+  final String? cursor;
+  final int? limit;
+  final String? q;
+  final PagesSortBy? sortBy;
+  final bool? hasComments;
+}
+
+/// Request parameters for [PublicApi.getTranslations].
+class ApiGetTranslationsRequest {
+  const ApiGetTranslationsRequest({
+    required this.namespace,
+    required this.component,
+    this.locale,
+    this.useFullTranslationIds,
+  });
+  final String namespace;
+  final String component;
+  final String? locale;
+  final bool? useFullTranslationIds;
+}
+
+/// Request parameters for [PublicApi.getUserNotificationCount].
+class ApiGetUserNotificationCountRequest {
+  const ApiGetUserNotificationCountRequest({
+    required this.tenantId,
+    this.sso,
+  });
+  final String tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getUserNotifications].
+class ApiGetUserNotificationsRequest {
+  const ApiGetUserNotificationsRequest({
+    required this.tenantId,
+    this.urlId,
+    this.pageSize,
+    this.afterId,
+    this.includeContext,
+    this.afterCreatedAt,
+    this.unreadOnly,
+    this.dmOnly,
+    this.noDm,
+    this.includeTranslations,
+    this.includeTenantNotifications,
+    this.sso,
+  });
+  final String tenantId;
+  final String? urlId;
+  final int? pageSize;
+  final String? afterId;
+  final bool? includeContext;
+  final int? afterCreatedAt;
+  final bool? unreadOnly;
+  final bool? dmOnly;
+  final bool? noDm;
+  final bool? includeTranslations;
+  final bool? includeTenantNotifications;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getUserPresenceStatuses].
+class ApiGetUserPresenceStatusesRequest {
+  const ApiGetUserPresenceStatusesRequest({
+    required this.tenantId,
+    required this.urlIdWS,
+    required this.userIds,
+  });
+  final String tenantId;
+  final String urlIdWS;
+  final String userIds;
+}
+
+/// Request parameters for [PublicApi.getUserReactsPublic].
+class ApiGetUserReactsPublicRequest {
+  const ApiGetUserReactsPublicRequest({
+    required this.tenantId,
+    this.postIds,
+    this.sso,
+  });
+  final String tenantId;
+  final List<String>? postIds;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.getUsersInfo].
+class ApiGetUsersInfoRequest {
+  const ApiGetUsersInfoRequest({
+    required this.tenantId,
+    required this.ids,
+  });
+  final String tenantId;
+  final String ids;
+}
+
+/// Request parameters for [PublicApi.getV1PageLikes].
+class ApiGetV1PageLikesRequest {
+  const ApiGetV1PageLikesRequest({
+    required this.tenantId,
+    required this.urlId,
+  });
+  final String tenantId;
+  final String urlId;
+}
+
+/// Request parameters for [PublicApi.getV2PageReactUsers].
+class ApiGetV2PageReactUsersRequest {
+  const ApiGetV2PageReactUsersRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.id,
+  });
+  final String tenantId;
+  final String urlId;
+  final String id;
+}
+
+/// Request parameters for [PublicApi.getV2PageReacts].
+class ApiGetV2PageReactsRequest {
+  const ApiGetV2PageReactsRequest({
+    required this.tenantId,
+    required this.urlId,
+  });
+  final String tenantId;
+  final String urlId;
+}
+
+/// Request parameters for [PublicApi.lockComment].
+class ApiLockCommentRequest {
+  const ApiLockCommentRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.logoutPublic].
+class ApiLogoutPublicRequest {
+  const ApiLogoutPublicRequest();
+}
+
+/// Request parameters for [PublicApi.pinComment].
+class ApiPinCommentRequest {
+  const ApiPinCommentRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.reactFeedPostPublic].
+class ApiReactFeedPostPublicRequest {
+  const ApiReactFeedPostPublicRequest({
+    required this.tenantId,
+    required this.postId,
+    required this.reactBodyParams,
+    this.isUndo,
+    this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String postId;
+  final ReactBodyParams reactBodyParams;
+  final bool? isUndo;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.resetUserNotificationCount].
+class ApiResetUserNotificationCountRequest {
+  const ApiResetUserNotificationCountRequest({
+    required this.tenantId,
+    this.sso,
+  });
+  final String tenantId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.resetUserNotifications].
+class ApiResetUserNotificationsRequest {
+  const ApiResetUserNotificationsRequest({
+    required this.tenantId,
+    this.afterId,
+    this.afterCreatedAt,
+    this.unreadOnly,
+    this.dmOnly,
+    this.noDm,
+    this.sso,
+  });
+  final String tenantId;
+  final String? afterId;
+  final int? afterCreatedAt;
+  final bool? unreadOnly;
+  final bool? dmOnly;
+  final bool? noDm;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.searchUsers].
+class ApiSearchUsersRequest {
+  const ApiSearchUsersRequest({
+    required this.tenantId,
+    required this.urlId,
+    this.usernameStartsWith,
+    this.mentionGroupIds,
+    this.sso,
+    this.searchSection,
+  });
+  final String tenantId;
+  final String urlId;
+  final String? usernameStartsWith;
+  final List<String>? mentionGroupIds;
+  final String? sso;
+  final String? searchSection;
+}
+
+/// Request parameters for [PublicApi.setCommentText].
+class ApiSetCommentTextRequest {
+  const ApiSetCommentTextRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.broadcastId,
+    required this.commentTextUpdateRequest,
+    this.editKey,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String broadcastId;
+  final CommentTextUpdateRequest commentTextUpdateRequest;
+  final String? editKey;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.unBlockCommentPublic].
+class ApiUnBlockCommentPublicRequest {
+  const ApiUnBlockCommentPublicRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.publicBlockFromCommentParams,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final PublicBlockFromCommentParams publicBlockFromCommentParams;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.unLockComment].
+class ApiUnLockCommentRequest {
+  const ApiUnLockCommentRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.unPinComment].
+class ApiUnPinCommentRequest {
+  const ApiUnPinCommentRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.updateFeedPostPublic].
+class ApiUpdateFeedPostPublicRequest {
+  const ApiUpdateFeedPostPublicRequest({
+    required this.tenantId,
+    required this.postId,
+    required this.updateFeedPostParams,
+    this.broadcastId,
+    this.sso,
+  });
+  final String tenantId;
+  final String postId;
+  final UpdateFeedPostParams updateFeedPostParams;
+  final String? broadcastId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.updateUserNotificationCommentSubscriptionStatus].
+class ApiUpdateUserNotificationCommentSubscriptionStatusRequest {
+  const ApiUpdateUserNotificationCommentSubscriptionStatusRequest({
+    required this.tenantId,
+    required this.notificationId,
+    required this.optedInOrOut,
+    required this.commentId,
+    this.sso,
+  });
+  final String tenantId;
+  final String notificationId;
+  final String optedInOrOut;
+  final String commentId;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.updateUserNotificationPageSubscriptionStatus].
+class ApiUpdateUserNotificationPageSubscriptionStatusRequest {
+  const ApiUpdateUserNotificationPageSubscriptionStatusRequest({
+    required this.tenantId,
+    required this.urlId,
+    required this.url,
+    required this.pageTitle,
+    required this.subscribedOrUnsubscribed,
+    this.sso,
+  });
+  final String tenantId;
+  final String urlId;
+  final String url;
+  final String pageTitle;
+  final String subscribedOrUnsubscribed;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.updateUserNotificationStatus].
+class ApiUpdateUserNotificationStatusRequest {
+  const ApiUpdateUserNotificationStatusRequest({
+    required this.tenantId,
+    required this.notificationId,
+    required this.newStatus,
+    this.sso,
+  });
+  final String tenantId;
+  final String notificationId;
+  final String newStatus;
+  final String? sso;
+}
+
+/// Request parameters for [PublicApi.uploadImage].
+class ApiUploadImageRequest {
+  const ApiUploadImageRequest({
+    required this.tenantId,
+    required this.file,
+    this.sizePreset,
+    this.urlId,
+  });
+  final String tenantId;
+  final MultipartFile file;
+  final SizePreset? sizePreset;
+  final String? urlId;
+}
+
+/// Request parameters for [PublicApi.voteComment].
+class ApiVoteCommentRequest {
+  const ApiVoteCommentRequest({
+    required this.tenantId,
+    required this.commentId,
+    required this.urlId,
+    required this.broadcastId,
+    required this.voteBodyParams,
+    this.sessionId,
+    this.sso,
+  });
+  final String tenantId;
+  final String commentId;
+  final String urlId;
+  final String broadcastId;
+  final VoteBodyParams voteBodyParams;
+  final String? sessionId;
+  final String? sso;
+}
diff --git a/client/test/moderation_api_test.dart b/client/test/moderation_api_test.dart
index 3af5ea1..a2d32bc 100644
--- a/client/test/moderation_api_test.dart
+++ b/client/test/moderation_api_test.dart
@@ -17,7 +17,7 @@ void main() {
   // final instance = ModerationApi();
 
   group('tests for ModerationApi', () {
-    //Future<VoteDeleteResponse> deleteModerationVote(String commentId, String voteId, { String broadcastId, String tenantId, String sso }) async
+    //Future<VoteDeleteResponse> deleteModerationVote(String commentId, String voteId, { String tenantId, String broadcastId, String sso }) async
     test('test deleteModerationVote', () async {
       // TODO
     });
@@ -132,7 +132,7 @@ void main() {
       // TODO
     });
 
-    //Future<AdjustVotesResponse> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String broadcastId, String tenantId, String sso }) async
+    //Future<AdjustVotesResponse> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String tenantId, String broadcastId, String sso }) async
     test('test postAdjustCommentVotes', () async {
       // TODO
     });
@@ -162,52 +162,52 @@ void main() {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postFlagComment(String commentId, { String broadcastId, String tenantId, String sso }) async
+    //Future<APIEmptyResponse> postFlagComment(String commentId, { String tenantId, String broadcastId, String sso }) async
     test('test postFlagComment', () async {
       // TODO
     });
 
-    //Future<PostRemoveCommentResponse> postRemoveComment(String commentId, { String broadcastId, String tenantId, String sso }) async
+    //Future<PostRemoveCommentResponse> postRemoveComment(String commentId, { String tenantId, String broadcastId, String sso }) async
     test('test postRemoveComment', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postRestoreDeletedComment(String commentId, { String broadcastId, String tenantId, String sso }) async
+    //Future<APIEmptyResponse> postRestoreDeletedComment(String commentId, { String tenantId, String broadcastId, String sso }) async
     test('test postRestoreDeletedComment', () async {
       // TODO
     });
 
-    //Future<SetCommentApprovedResponse> postSetCommentApprovalStatus(String commentId, { bool approved, String broadcastId, String tenantId, String sso }) async
+    //Future<SetCommentApprovedResponse> postSetCommentApprovalStatus(String commentId, { bool approved, String tenantId, String broadcastId, String sso }) async
     test('test postSetCommentApprovalStatus', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postSetCommentReviewStatus(String commentId, { bool reviewed, String broadcastId, String tenantId, String sso }) async
+    //Future<APIEmptyResponse> postSetCommentReviewStatus(String commentId, { bool reviewed, String tenantId, String broadcastId, String sso }) async
     test('test postSetCommentReviewStatus', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postSetCommentSpamStatus(String commentId, { bool spam, bool permNotSpam, String broadcastId, String tenantId, String sso }) async
+    //Future<APIEmptyResponse> postSetCommentSpamStatus(String commentId, { bool spam, bool permNotSpam, String tenantId, String broadcastId, String sso }) async
     test('test postSetCommentSpamStatus', () async {
       // TODO
     });
 
-    //Future<SetCommentTextResponse> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String broadcastId, String tenantId, String sso }) async
+    //Future<SetCommentTextResponse> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String tenantId, String broadcastId, String sso }) async
     test('test postSetCommentText', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postUnFlagComment(String commentId, { String broadcastId, String tenantId, String sso }) async
+    //Future<APIEmptyResponse> postUnFlagComment(String commentId, { String tenantId, String broadcastId, String sso }) async
     test('test postUnFlagComment', () async {
       // TODO
     });
 
-    //Future<VoteResponse> postVote(String commentId, { String direction, String broadcastId, String tenantId, String sso }) async
+    //Future<VoteResponse> postVote(String commentId, { String direction, String tenantId, String broadcastId, String sso }) async
     test('test postVote', () async {
       // TODO
     });
 
-    //Future<AwardUserBadgeResponse> putAwardBadge(String badgeId, { String userId, String commentId, String broadcastId, String tenantId, String sso }) async
+    //Future<AwardUserBadgeResponse> putAwardBadge(String badgeId, { String userId, String commentId, String tenantId, String broadcastId, String sso }) async
     test('test putAwardBadge', () async {
       // TODO
     });
@@ -217,7 +217,7 @@ void main() {
       // TODO
     });
 
-    //Future<RemoveUserBadgeResponse> putRemoveBadge(String badgeId, { String userId, String commentId, String broadcastId, String tenantId, String sso }) async
+    //Future<RemoveUserBadgeResponse> putRemoveBadge(String badgeId, { String userId, String commentId, String tenantId, String broadcastId, String sso }) async
     test('test putRemoveBadge', () async {
       // TODO
     });
diff --git a/config.json b/config.json
index 30d10ef..b26052e 100644
--- a/config.json
+++ b/config.json
@@ -7,5 +7,6 @@
   "pubHomepage": "https://fastcomments.com",
   "pubRepository": "https://github.com/fastcomments/fastcomments-dart",
   "hideGenerationTimestamp": true,
-  "useEnumExtension": true
+  "useEnumExtension": true,
+  "useSingleRequestParameter": true
 }
diff --git a/openapi.json b/openapi.json
index 0f72c9c..9ed89a9 100644
--- a/openapi.json
+++ b/openapi.json
@@ -14304,7 +14304,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14312,7 +14312,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14369,7 +14369,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14377,7 +14377,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14434,7 +14434,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14442,7 +14442,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14499,7 +14499,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14507,7 +14507,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14572,7 +14572,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14580,7 +14580,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14653,7 +14653,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14661,7 +14661,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14726,7 +14726,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -14734,7 +14734,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15094,7 +15094,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15102,7 +15102,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15169,7 +15169,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15177,7 +15177,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15252,7 +15252,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15260,7 +15260,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15325,7 +15325,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15333,7 +15333,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15626,7 +15626,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15634,7 +15634,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15707,7 +15707,7 @@
 					},
 					{
 						"in": "query",
-						"name": "broadcastId",
+						"name": "tenantId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15715,7 +15715,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"schema": {
 							"type": "string"
diff --git a/sso_tests/test/sso_integration_test.dart b/sso_tests/test/sso_integration_test.dart
index 8ba5d15..c0ea9bd 100644
--- a/sso_tests/test/sso_integration_test.dart
+++ b/sso_tests/test/sso_integration_test.dart
@@ -38,14 +38,23 @@ void main() {
       urlId: urlId,
     );
 
-    final createResponse =
-        await api.createCommentPublic(tenantId!, urlId, 'dart-test-$timestamp', commentData, sso: token);
+    final createResponse = await api.createCommentPublic(ApiCreateCommentPublicRequest(
+      tenantId: tenantId!,
+      urlId: urlId,
+      broadcastId: 'dart-test-$timestamp',
+      commentData: commentData,
+      sso: token,
+    ));
     expect(createResponse, isNotNull);
     expect(createResponse!.status, APIStatus.success);
     expect(createResponse.comment.commenterName, user.username);
     expect(createResponse.comment.commentHTML, contains(commentText));
 
-    final getResponse = await api.getCommentsPublic(tenantId, urlId, sso: token);
+    final getResponse = await api.getCommentsPublic(ApiGetCommentsPublicRequest(
+      tenantId: tenantId,
+      urlId: urlId,
+      sso: token,
+    ));
     expect(getResponse, isNotNull);
     expect(getResponse!.status, 'success');
     expect(getResponse.comments, isNotEmpty);

From a097175b0c705a92af791af43788983f9d0d5266 Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Mon, 22 Jun 2026 21:55:07 -0700
Subject: [PATCH 3/9] Regenerate docs with grouped request-object examples

API reference examples now construct the single Api<Op>Request object, matching the grouped method signatures.
---
 client/doc/DefaultApi.md    | 456 ++++++++++++++++++------------------
 client/doc/ModerationApi.md | 172 +++++++-------
 client/doc/PublicApi.md     | 208 ++++++++--------
 3 files changed, 418 insertions(+), 418 deletions(-)

diff --git a/client/doc/DefaultApi.md b/client/doc/DefaultApi.md
index d0251a9..3236173 100644
--- a/client/doc/DefaultApi.md
+++ b/client/doc/DefaultApi.md
@@ -126,7 +126,7 @@ Method | HTTP request | Description
 
 
 # **addDomainConfig**
-> AddDomainConfigResponse addDomainConfig(tenantId, addDomainConfigParams)
+> AddDomainConfigResponse addDomainConfig(ApiAddDomainConfigRequest)
 
 
 
@@ -143,7 +143,7 @@ final tenantId = tenantId_example; // String |
 final addDomainConfigParams = AddDomainConfigParams(); // AddDomainConfigParams | 
 
 try {
-    final result = api_instance.addDomainConfig(tenantId, addDomainConfigParams);
+    final result = api_instance.addDomainConfig(ApiAddDomainConfigRequest(tenantId: tenantId, addDomainConfigParams: addDomainConfigParams));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addDomainConfig: $e\n');
@@ -173,7 +173,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTag**
-> CreateHashTagResponse addHashTag(tenantId, createHashTagBody)
+> CreateHashTagResponse addHashTag(ApiAddHashTagRequest)
 
 
 
@@ -190,7 +190,7 @@ final tenantId = tenantId_example; // String |
 final createHashTagBody = CreateHashTagBody(); // CreateHashTagBody | 
 
 try {
-    final result = api_instance.addHashTag(tenantId, createHashTagBody);
+    final result = api_instance.addHashTag(ApiAddHashTagRequest(tenantId: tenantId, createHashTagBody: createHashTagBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTag: $e\n');
@@ -220,7 +220,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTagsBulk**
-> BulkCreateHashTagsResponse addHashTagsBulk(tenantId, bulkCreateHashTagsBody)
+> BulkCreateHashTagsResponse addHashTagsBulk(ApiAddHashTagsBulkRequest)
 
 
 
@@ -237,7 +237,7 @@ final tenantId = tenantId_example; // String |
 final bulkCreateHashTagsBody = BulkCreateHashTagsBody(); // BulkCreateHashTagsBody | 
 
 try {
-    final result = api_instance.addHashTagsBulk(tenantId, bulkCreateHashTagsBody);
+    final result = api_instance.addHashTagsBulk(ApiAddHashTagsBulkRequest(tenantId: tenantId, bulkCreateHashTagsBody: bulkCreateHashTagsBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTagsBulk: $e\n');
@@ -267,7 +267,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addPage**
-> AddPageAPIResponse addPage(tenantId, createAPIPageData)
+> AddPageAPIResponse addPage(ApiAddPageRequest)
 
 
 
@@ -284,7 +284,7 @@ final tenantId = tenantId_example; // String |
 final createAPIPageData = CreateAPIPageData(); // CreateAPIPageData | 
 
 try {
-    final result = api_instance.addPage(tenantId, createAPIPageData);
+    final result = api_instance.addPage(ApiAddPageRequest(tenantId: tenantId, createAPIPageData: createAPIPageData));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addPage: $e\n');
@@ -314,7 +314,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addSSOUser**
-> AddSSOUserAPIResponse addSSOUser(tenantId, createAPISSOUserData)
+> AddSSOUserAPIResponse addSSOUser(ApiAddSSOUserRequest)
 
 
 
@@ -331,7 +331,7 @@ final tenantId = tenantId_example; // String |
 final createAPISSOUserData = CreateAPISSOUserData(); // CreateAPISSOUserData | 
 
 try {
-    final result = api_instance.addSSOUser(tenantId, createAPISSOUserData);
+    final result = api_instance.addSSOUser(ApiAddSSOUserRequest(tenantId: tenantId, createAPISSOUserData: createAPISSOUserData));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addSSOUser: $e\n');
@@ -361,7 +361,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **aggregate**
-> AggregateResponse aggregate(tenantId, aggregationRequest, parentTenantId, includeStats)
+> AggregateResponse aggregate(ApiAggregateRequest)
 
 
 
@@ -382,7 +382,7 @@ final parentTenantId = parentTenantId_example; // String |
 final includeStats = true; // bool | 
 
 try {
-    final result = api_instance.aggregate(tenantId, aggregationRequest, parentTenantId, includeStats);
+    final result = api_instance.aggregate(ApiAggregateRequest(tenantId: tenantId, aggregationRequest: aggregationRequest, parentTenantId: parentTenantId, includeStats: includeStats));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->aggregate: $e\n');
@@ -414,7 +414,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **aggregateQuestionResults**
-> AggregateQuestionResultsResponse aggregateQuestionResults(tenantId, questionId, questionIds, urlId, timeBucket, startDate, forceRecalculate)
+> AggregateQuestionResultsResponse aggregateQuestionResults(ApiAggregateQuestionResultsRequest)
 
 
 
@@ -436,7 +436,7 @@ final startDate = 2013-10-20T19:20:30+01:00; // DateTime |
 final forceRecalculate = true; // bool | 
 
 try {
-    final result = api_instance.aggregateQuestionResults(tenantId, questionId, questionIds, urlId, timeBucket, startDate, forceRecalculate);
+    final result = api_instance.aggregateQuestionResults(ApiAggregateQuestionResultsRequest(tenantId: tenantId, questionId: questionId, questionIds: questionIds, urlId: urlId, timeBucket: timeBucket, startDate: startDate, forceRecalculate: forceRecalculate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->aggregateQuestionResults: $e\n');
@@ -471,7 +471,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **blockUserFromComment**
-> BlockSuccess blockUserFromComment(tenantId, id, blockFromCommentParams, userId, anonUserId)
+> BlockSuccess blockUserFromComment(ApiBlockUserFromCommentRequest)
 
 
 
@@ -491,7 +491,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.blockUserFromComment(tenantId, id, blockFromCommentParams, userId, anonUserId);
+    final result = api_instance.blockUserFromComment(ApiBlockUserFromCommentRequest(tenantId: tenantId, id: id, blockFromCommentParams: blockFromCommentParams, userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->blockUserFromComment: $e\n');
@@ -524,7 +524,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **bulkAggregateQuestionResults**
-> BulkAggregateQuestionResultsResponse bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate)
+> BulkAggregateQuestionResultsResponse bulkAggregateQuestionResults(ApiBulkAggregateQuestionResultsRequest)
 
 
 
@@ -542,7 +542,7 @@ final bulkAggregateQuestionResultsRequest = BulkAggregateQuestionResultsRequest(
 final forceRecalculate = true; // bool | 
 
 try {
-    final result = api_instance.bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate);
+    final result = api_instance.bulkAggregateQuestionResults(ApiBulkAggregateQuestionResultsRequest(tenantId: tenantId, bulkAggregateQuestionResultsRequest: bulkAggregateQuestionResultsRequest, forceRecalculate: forceRecalculate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->bulkAggregateQuestionResults: $e\n');
@@ -573,7 +573,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **changeTicketState**
-> ChangeTicketStateResponse changeTicketState(tenantId, userId, id, changeTicketStateBody)
+> ChangeTicketStateResponse changeTicketState(ApiChangeTicketStateRequest)
 
 
 
@@ -592,7 +592,7 @@ final id = id_example; // String |
 final changeTicketStateBody = ChangeTicketStateBody(); // ChangeTicketStateBody | 
 
 try {
-    final result = api_instance.changeTicketState(tenantId, userId, id, changeTicketStateBody);
+    final result = api_instance.changeTicketState(ApiChangeTicketStateRequest(tenantId: tenantId, userId: userId, id: id, changeTicketStateBody: changeTicketStateBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->changeTicketState: $e\n');
@@ -624,7 +624,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **combineCommentsWithQuestionResults**
-> CombineQuestionResultsWithCommentsResponse combineCommentsWithQuestionResults(tenantId, questionId, questionIds, urlId, startDate, forceRecalculate, minValue, maxValue, limit)
+> CombineQuestionResultsWithCommentsResponse combineCommentsWithQuestionResults(ApiCombineCommentsWithQuestionResultsRequest)
 
 
 
@@ -648,7 +648,7 @@ final maxValue = 1.2; // double |
 final limit = 1.2; // double | 
 
 try {
-    final result = api_instance.combineCommentsWithQuestionResults(tenantId, questionId, questionIds, urlId, startDate, forceRecalculate, minValue, maxValue, limit);
+    final result = api_instance.combineCommentsWithQuestionResults(ApiCombineCommentsWithQuestionResultsRequest(tenantId: tenantId, questionId: questionId, questionIds: questionIds, urlId: urlId, startDate: startDate, forceRecalculate: forceRecalculate, minValue: minValue, maxValue: maxValue, limit: limit));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->combineCommentsWithQuestionResults: $e\n');
@@ -685,7 +685,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createEmailTemplate**
-> CreateEmailTemplateResponse createEmailTemplate(tenantId, createEmailTemplateBody)
+> CreateEmailTemplateResponse createEmailTemplate(ApiCreateEmailTemplateRequest)
 
 
 
@@ -702,7 +702,7 @@ final tenantId = tenantId_example; // String |
 final createEmailTemplateBody = CreateEmailTemplateBody(); // CreateEmailTemplateBody | 
 
 try {
-    final result = api_instance.createEmailTemplate(tenantId, createEmailTemplateBody);
+    final result = api_instance.createEmailTemplate(ApiCreateEmailTemplateRequest(tenantId: tenantId, createEmailTemplateBody: createEmailTemplateBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createEmailTemplate: $e\n');
@@ -732,7 +732,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createFeedPost**
-> CreateFeedPostsResponse createFeedPost(tenantId, createFeedPostParams, broadcastId, isLive, doSpamCheck, skipDupCheck)
+> CreateFeedPostsResponse createFeedPost(ApiCreateFeedPostRequest)
 
 
 
@@ -753,7 +753,7 @@ final doSpamCheck = true; // bool |
 final skipDupCheck = true; // bool | 
 
 try {
-    final result = api_instance.createFeedPost(tenantId, createFeedPostParams, broadcastId, isLive, doSpamCheck, skipDupCheck);
+    final result = api_instance.createFeedPost(ApiCreateFeedPostRequest(tenantId: tenantId, createFeedPostParams: createFeedPostParams, broadcastId: broadcastId, isLive: isLive, doSpamCheck: doSpamCheck, skipDupCheck: skipDupCheck));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createFeedPost: $e\n');
@@ -787,7 +787,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createModerator**
-> CreateModeratorResponse createModerator(tenantId, createModeratorBody)
+> CreateModeratorResponse createModerator(ApiCreateModeratorRequest)
 
 
 
@@ -804,7 +804,7 @@ final tenantId = tenantId_example; // String |
 final createModeratorBody = CreateModeratorBody(); // CreateModeratorBody | 
 
 try {
-    final result = api_instance.createModerator(tenantId, createModeratorBody);
+    final result = api_instance.createModerator(ApiCreateModeratorRequest(tenantId: tenantId, createModeratorBody: createModeratorBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createModerator: $e\n');
@@ -834,7 +834,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createQuestionConfig**
-> CreateQuestionConfigResponse createQuestionConfig(tenantId, createQuestionConfigBody)
+> CreateQuestionConfigResponse createQuestionConfig(ApiCreateQuestionConfigRequest)
 
 
 
@@ -851,7 +851,7 @@ final tenantId = tenantId_example; // String |
 final createQuestionConfigBody = CreateQuestionConfigBody(); // CreateQuestionConfigBody | 
 
 try {
-    final result = api_instance.createQuestionConfig(tenantId, createQuestionConfigBody);
+    final result = api_instance.createQuestionConfig(ApiCreateQuestionConfigRequest(tenantId: tenantId, createQuestionConfigBody: createQuestionConfigBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createQuestionConfig: $e\n');
@@ -881,7 +881,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createQuestionResult**
-> CreateQuestionResultResponse createQuestionResult(tenantId, createQuestionResultBody)
+> CreateQuestionResultResponse createQuestionResult(ApiCreateQuestionResultRequest)
 
 
 
@@ -898,7 +898,7 @@ final tenantId = tenantId_example; // String |
 final createQuestionResultBody = CreateQuestionResultBody(); // CreateQuestionResultBody | 
 
 try {
-    final result = api_instance.createQuestionResult(tenantId, createQuestionResultBody);
+    final result = api_instance.createQuestionResult(ApiCreateQuestionResultRequest(tenantId: tenantId, createQuestionResultBody: createQuestionResultBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createQuestionResult: $e\n');
@@ -928,7 +928,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createSubscription**
-> CreateSubscriptionAPIResponse createSubscription(tenantId, createAPIUserSubscriptionData)
+> CreateSubscriptionAPIResponse createSubscription(ApiCreateSubscriptionRequest)
 
 
 
@@ -945,7 +945,7 @@ final tenantId = tenantId_example; // String |
 final createAPIUserSubscriptionData = CreateAPIUserSubscriptionData(); // CreateAPIUserSubscriptionData | 
 
 try {
-    final result = api_instance.createSubscription(tenantId, createAPIUserSubscriptionData);
+    final result = api_instance.createSubscription(ApiCreateSubscriptionRequest(tenantId: tenantId, createAPIUserSubscriptionData: createAPIUserSubscriptionData));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createSubscription: $e\n');
@@ -975,7 +975,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenant**
-> CreateTenantResponse createTenant(tenantId, createTenantBody)
+> CreateTenantResponse createTenant(ApiCreateTenantRequest)
 
 
 
@@ -992,7 +992,7 @@ final tenantId = tenantId_example; // String |
 final createTenantBody = CreateTenantBody(); // CreateTenantBody | 
 
 try {
-    final result = api_instance.createTenant(tenantId, createTenantBody);
+    final result = api_instance.createTenant(ApiCreateTenantRequest(tenantId: tenantId, createTenantBody: createTenantBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenant: $e\n');
@@ -1022,7 +1022,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenantPackage**
-> CreateTenantPackageResponse createTenantPackage(tenantId, createTenantPackageBody)
+> CreateTenantPackageResponse createTenantPackage(ApiCreateTenantPackageRequest)
 
 
 
@@ -1039,7 +1039,7 @@ final tenantId = tenantId_example; // String |
 final createTenantPackageBody = CreateTenantPackageBody(); // CreateTenantPackageBody | 
 
 try {
-    final result = api_instance.createTenantPackage(tenantId, createTenantPackageBody);
+    final result = api_instance.createTenantPackage(ApiCreateTenantPackageRequest(tenantId: tenantId, createTenantPackageBody: createTenantPackageBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenantPackage: $e\n');
@@ -1069,7 +1069,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenantUser**
-> CreateTenantUserResponse createTenantUser(tenantId, createTenantUserBody)
+> CreateTenantUserResponse createTenantUser(ApiCreateTenantUserRequest)
 
 
 
@@ -1086,7 +1086,7 @@ final tenantId = tenantId_example; // String |
 final createTenantUserBody = CreateTenantUserBody(); // CreateTenantUserBody | 
 
 try {
-    final result = api_instance.createTenantUser(tenantId, createTenantUserBody);
+    final result = api_instance.createTenantUser(ApiCreateTenantUserRequest(tenantId: tenantId, createTenantUserBody: createTenantUserBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenantUser: $e\n');
@@ -1116,7 +1116,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTicket**
-> CreateTicketResponse createTicket(tenantId, userId, createTicketBody)
+> CreateTicketResponse createTicket(ApiCreateTicketRequest)
 
 
 
@@ -1134,7 +1134,7 @@ final userId = userId_example; // String |
 final createTicketBody = CreateTicketBody(); // CreateTicketBody | 
 
 try {
-    final result = api_instance.createTicket(tenantId, userId, createTicketBody);
+    final result = api_instance.createTicket(ApiCreateTicketRequest(tenantId: tenantId, userId: userId, createTicketBody: createTicketBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTicket: $e\n');
@@ -1165,7 +1165,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUserBadge**
-> APICreateUserBadgeResponse createUserBadge(tenantId, createUserBadgeParams)
+> APICreateUserBadgeResponse createUserBadge(ApiCreateUserBadgeRequest)
 
 
 
@@ -1182,7 +1182,7 @@ final tenantId = tenantId_example; // String |
 final createUserBadgeParams = CreateUserBadgeParams(); // CreateUserBadgeParams | 
 
 try {
-    final result = api_instance.createUserBadge(tenantId, createUserBadgeParams);
+    final result = api_instance.createUserBadge(ApiCreateUserBadgeRequest(tenantId: tenantId, createUserBadgeParams: createUserBadgeParams));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createUserBadge: $e\n');
@@ -1212,7 +1212,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createVote**
-> VoteResponse createVote(tenantId, commentId, direction, userId, anonUserId)
+> VoteResponse createVote(ApiCreateVoteRequest)
 
 
 
@@ -1232,7 +1232,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.createVote(tenantId, commentId, direction, userId, anonUserId);
+    final result = api_instance.createVote(ApiCreateVoteRequest(tenantId: tenantId, commentId: commentId, direction: direction, userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createVote: $e\n');
@@ -1265,7 +1265,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteComment**
-> DeleteCommentResult deleteComment(tenantId, id, contextUserId, isLive)
+> DeleteCommentResult deleteComment(ApiDeleteCommentRequest)
 
 
 
@@ -1284,7 +1284,7 @@ final contextUserId = contextUserId_example; // String |
 final isLive = true; // bool | 
 
 try {
-    final result = api_instance.deleteComment(tenantId, id, contextUserId, isLive);
+    final result = api_instance.deleteComment(ApiDeleteCommentRequest(tenantId: tenantId, id: id, contextUserId: contextUserId, isLive: isLive));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteComment: $e\n');
@@ -1316,7 +1316,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteDomainConfig**
-> DeleteDomainConfigResponse deleteDomainConfig(tenantId, domain)
+> DeleteDomainConfigResponse deleteDomainConfig(ApiDeleteDomainConfigRequest)
 
 
 
@@ -1333,7 +1333,7 @@ final tenantId = tenantId_example; // String |
 final domain = domain_example; // String | 
 
 try {
-    final result = api_instance.deleteDomainConfig(tenantId, domain);
+    final result = api_instance.deleteDomainConfig(ApiDeleteDomainConfigRequest(tenantId: tenantId, domain: domain));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteDomainConfig: $e\n');
@@ -1363,7 +1363,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteEmailTemplate**
-> APIEmptyResponse deleteEmailTemplate(tenantId, id)
+> APIEmptyResponse deleteEmailTemplate(ApiDeleteEmailTemplateRequest)
 
 
 
@@ -1380,7 +1380,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteEmailTemplate(tenantId, id);
+    final result = api_instance.deleteEmailTemplate(ApiDeleteEmailTemplateRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteEmailTemplate: $e\n');
@@ -1410,7 +1410,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteEmailTemplateRenderError**
-> APIEmptyResponse deleteEmailTemplateRenderError(tenantId, id, errorId)
+> APIEmptyResponse deleteEmailTemplateRenderError(ApiDeleteEmailTemplateRenderErrorRequest)
 
 
 
@@ -1428,7 +1428,7 @@ final id = id_example; // String |
 final errorId = errorId_example; // String | 
 
 try {
-    final result = api_instance.deleteEmailTemplateRenderError(tenantId, id, errorId);
+    final result = api_instance.deleteEmailTemplateRenderError(ApiDeleteEmailTemplateRenderErrorRequest(tenantId: tenantId, id: id, errorId: errorId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteEmailTemplateRenderError: $e\n');
@@ -1459,7 +1459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteHashTag**
-> APIEmptyResponse deleteHashTag(tag, tenantId, deleteHashTagRequestBody)
+> APIEmptyResponse deleteHashTag(ApiDeleteHashTagRequest)
 
 
 
@@ -1477,7 +1477,7 @@ final tenantId = tenantId_example; // String |
 final deleteHashTagRequestBody = DeleteHashTagRequestBody(); // DeleteHashTagRequestBody | 
 
 try {
-    final result = api_instance.deleteHashTag(tag, tenantId, deleteHashTagRequestBody);
+    final result = api_instance.deleteHashTag(ApiDeleteHashTagRequest(tag: tag, tenantId: tenantId, deleteHashTagRequestBody: deleteHashTagRequestBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteHashTag: $e\n');
@@ -1508,7 +1508,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteModerator**
-> APIEmptyResponse deleteModerator(tenantId, id, sendEmail)
+> APIEmptyResponse deleteModerator(ApiDeleteModeratorRequest)
 
 
 
@@ -1526,7 +1526,7 @@ final id = id_example; // String |
 final sendEmail = sendEmail_example; // String | 
 
 try {
-    final result = api_instance.deleteModerator(tenantId, id, sendEmail);
+    final result = api_instance.deleteModerator(ApiDeleteModeratorRequest(tenantId: tenantId, id: id, sendEmail: sendEmail));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteModerator: $e\n');
@@ -1557,7 +1557,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteNotificationCount**
-> APIEmptyResponse deleteNotificationCount(tenantId, id)
+> APIEmptyResponse deleteNotificationCount(ApiDeleteNotificationCountRequest)
 
 
 
@@ -1574,7 +1574,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteNotificationCount(tenantId, id);
+    final result = api_instance.deleteNotificationCount(ApiDeleteNotificationCountRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteNotificationCount: $e\n');
@@ -1604,7 +1604,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deletePage**
-> DeletePageAPIResponse deletePage(tenantId, id)
+> DeletePageAPIResponse deletePage(ApiDeletePageRequest)
 
 
 
@@ -1621,7 +1621,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deletePage(tenantId, id);
+    final result = api_instance.deletePage(ApiDeletePageRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deletePage: $e\n');
@@ -1651,7 +1651,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deletePendingWebhookEvent**
-> APIEmptyResponse deletePendingWebhookEvent(tenantId, id)
+> APIEmptyResponse deletePendingWebhookEvent(ApiDeletePendingWebhookEventRequest)
 
 
 
@@ -1668,7 +1668,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deletePendingWebhookEvent(tenantId, id);
+    final result = api_instance.deletePendingWebhookEvent(ApiDeletePendingWebhookEventRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deletePendingWebhookEvent: $e\n');
@@ -1698,7 +1698,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteQuestionConfig**
-> APIEmptyResponse deleteQuestionConfig(tenantId, id)
+> APIEmptyResponse deleteQuestionConfig(ApiDeleteQuestionConfigRequest)
 
 
 
@@ -1715,7 +1715,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteQuestionConfig(tenantId, id);
+    final result = api_instance.deleteQuestionConfig(ApiDeleteQuestionConfigRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteQuestionConfig: $e\n');
@@ -1745,7 +1745,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteQuestionResult**
-> APIEmptyResponse deleteQuestionResult(tenantId, id)
+> APIEmptyResponse deleteQuestionResult(ApiDeleteQuestionResultRequest)
 
 
 
@@ -1762,7 +1762,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteQuestionResult(tenantId, id);
+    final result = api_instance.deleteQuestionResult(ApiDeleteQuestionResultRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteQuestionResult: $e\n');
@@ -1792,7 +1792,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteSSOUser**
-> DeleteSSOUserAPIResponse deleteSSOUser(tenantId, id, deleteComments, commentDeleteMode)
+> DeleteSSOUserAPIResponse deleteSSOUser(ApiDeleteSSOUserRequest)
 
 
 
@@ -1811,7 +1811,7 @@ final deleteComments = true; // bool |
 final commentDeleteMode = commentDeleteMode_example; // String | 
 
 try {
-    final result = api_instance.deleteSSOUser(tenantId, id, deleteComments, commentDeleteMode);
+    final result = api_instance.deleteSSOUser(ApiDeleteSSOUserRequest(tenantId: tenantId, id: id, deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteSSOUser: $e\n');
@@ -1843,7 +1843,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteSubscription**
-> DeleteSubscriptionAPIResponse deleteSubscription(tenantId, id, userId)
+> DeleteSubscriptionAPIResponse deleteSubscription(ApiDeleteSubscriptionRequest)
 
 
 
@@ -1861,7 +1861,7 @@ final id = id_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.deleteSubscription(tenantId, id, userId);
+    final result = api_instance.deleteSubscription(ApiDeleteSubscriptionRequest(tenantId: tenantId, id: id, userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteSubscription: $e\n');
@@ -1892,7 +1892,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenant**
-> APIEmptyResponse deleteTenant(tenantId, id, sure)
+> APIEmptyResponse deleteTenant(ApiDeleteTenantRequest)
 
 
 
@@ -1910,7 +1910,7 @@ final id = id_example; // String |
 final sure = sure_example; // String | 
 
 try {
-    final result = api_instance.deleteTenant(tenantId, id, sure);
+    final result = api_instance.deleteTenant(ApiDeleteTenantRequest(tenantId: tenantId, id: id, sure: sure));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenant: $e\n');
@@ -1941,7 +1941,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenantPackage**
-> APIEmptyResponse deleteTenantPackage(tenantId, id)
+> APIEmptyResponse deleteTenantPackage(ApiDeleteTenantPackageRequest)
 
 
 
@@ -1958,7 +1958,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteTenantPackage(tenantId, id);
+    final result = api_instance.deleteTenantPackage(ApiDeleteTenantPackageRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenantPackage: $e\n');
@@ -1988,7 +1988,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenantUser**
-> APIEmptyResponse deleteTenantUser(tenantId, id, deleteComments, commentDeleteMode)
+> APIEmptyResponse deleteTenantUser(ApiDeleteTenantUserRequest)
 
 
 
@@ -2007,7 +2007,7 @@ final deleteComments = deleteComments_example; // String |
 final commentDeleteMode = commentDeleteMode_example; // String | 
 
 try {
-    final result = api_instance.deleteTenantUser(tenantId, id, deleteComments, commentDeleteMode);
+    final result = api_instance.deleteTenantUser(ApiDeleteTenantUserRequest(tenantId: tenantId, id: id, deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenantUser: $e\n');
@@ -2039,7 +2039,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteUserBadge**
-> APIEmptySuccessResponse deleteUserBadge(tenantId, id)
+> APIEmptySuccessResponse deleteUserBadge(ApiDeleteUserBadgeRequest)
 
 
 
@@ -2056,7 +2056,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteUserBadge(tenantId, id);
+    final result = api_instance.deleteUserBadge(ApiDeleteUserBadgeRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteUserBadge: $e\n');
@@ -2086,7 +2086,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteVote**
-> VoteDeleteResponse deleteVote(tenantId, id, editKey)
+> VoteDeleteResponse deleteVote(ApiDeleteVoteRequest)
 
 
 
@@ -2104,7 +2104,7 @@ final id = id_example; // String |
 final editKey = editKey_example; // String | 
 
 try {
-    final result = api_instance.deleteVote(tenantId, id, editKey);
+    final result = api_instance.deleteVote(ApiDeleteVoteRequest(tenantId: tenantId, id: id, editKey: editKey));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteVote: $e\n');
@@ -2135,7 +2135,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **flagComment**
-> FlagCommentResponse flagComment(tenantId, id, userId, anonUserId)
+> FlagCommentResponse flagComment(ApiFlagCommentRequest)
 
 
 
@@ -2154,7 +2154,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.flagComment(tenantId, id, userId, anonUserId);
+    final result = api_instance.flagComment(ApiFlagCommentRequest(tenantId: tenantId, id: id, userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->flagComment: $e\n');
@@ -2186,7 +2186,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getAuditLogs**
-> GetAuditLogsResponse getAuditLogs(tenantId, limit, skip, order, after, before)
+> GetAuditLogsResponse getAuditLogs(ApiGetAuditLogsRequest)
 
 
 
@@ -2207,7 +2207,7 @@ final after = 1.2; // double |
 final before = 1.2; // double | 
 
 try {
-    final result = api_instance.getAuditLogs(tenantId, limit, skip, order, after, before);
+    final result = api_instance.getAuditLogs(ApiGetAuditLogsRequest(tenantId: tenantId, limit: limit, skip: skip, order: order, after: after, before: before));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getAuditLogs: $e\n');
@@ -2241,7 +2241,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCachedNotificationCount**
-> GetCachedNotificationCountResponse getCachedNotificationCount(tenantId, id)
+> GetCachedNotificationCountResponse getCachedNotificationCount(ApiGetCachedNotificationCountRequest)
 
 
 
@@ -2258,7 +2258,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getCachedNotificationCount(tenantId, id);
+    final result = api_instance.getCachedNotificationCount(ApiGetCachedNotificationCountRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getCachedNotificationCount: $e\n');
@@ -2288,7 +2288,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getComment**
-> APIGetCommentResponse getComment(tenantId, id)
+> APIGetCommentResponse getComment(ApiGetCommentRequest)
 
 
 
@@ -2305,7 +2305,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getComment(tenantId, id);
+    final result = api_instance.getComment(ApiGetCommentRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getComment: $e\n');
@@ -2335,7 +2335,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getComments**
-> APIGetCommentsResponse getComments(tenantId, page, limit, skip, asTree, skipChildren, limitChildren, maxTreeDepth, urlId, userId, anonUserId, contextUserId, hashTag, parentId, direction, fromDate, toDate)
+> APIGetCommentsResponse getComments(ApiGetCommentsRequest)
 
 
 
@@ -2367,7 +2367,7 @@ final fromDate = 789; // int |
 final toDate = 789; // int | 
 
 try {
-    final result = api_instance.getComments(tenantId, page, limit, skip, asTree, skipChildren, limitChildren, maxTreeDepth, urlId, userId, anonUserId, contextUserId, hashTag, parentId, direction, fromDate, toDate);
+    final result = api_instance.getComments(ApiGetCommentsRequest(tenantId: tenantId, page: page, limit: limit, skip: skip, asTree: asTree, skipChildren: skipChildren, limitChildren: limitChildren, maxTreeDepth: maxTreeDepth, urlId: urlId, userId: userId, anonUserId: anonUserId, contextUserId: contextUserId, hashTag: hashTag, parentId: parentId, direction: direction, fromDate: fromDate, toDate: toDate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getComments: $e\n');
@@ -2412,7 +2412,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getDomainConfig**
-> GetDomainConfigResponse getDomainConfig(tenantId, domain)
+> GetDomainConfigResponse getDomainConfig(ApiGetDomainConfigRequest)
 
 
 
@@ -2429,7 +2429,7 @@ final tenantId = tenantId_example; // String |
 final domain = domain_example; // String | 
 
 try {
-    final result = api_instance.getDomainConfig(tenantId, domain);
+    final result = api_instance.getDomainConfig(ApiGetDomainConfigRequest(tenantId: tenantId, domain: domain));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getDomainConfig: $e\n');
@@ -2459,7 +2459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getDomainConfigs**
-> GetDomainConfigsResponse getDomainConfigs(tenantId)
+> GetDomainConfigsResponse getDomainConfigs(ApiGetDomainConfigsRequest)
 
 
 
@@ -2475,7 +2475,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getDomainConfigs(tenantId);
+    final result = api_instance.getDomainConfigs(ApiGetDomainConfigsRequest(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getDomainConfigs: $e\n');
@@ -2504,7 +2504,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplate**
-> GetEmailTemplateResponse getEmailTemplate(tenantId, id)
+> GetEmailTemplateResponse getEmailTemplate(ApiGetEmailTemplateRequest)
 
 
 
@@ -2521,7 +2521,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getEmailTemplate(tenantId, id);
+    final result = api_instance.getEmailTemplate(ApiGetEmailTemplateRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplate: $e\n');
@@ -2551,7 +2551,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplateDefinitions**
-> GetEmailTemplateDefinitionsResponse getEmailTemplateDefinitions(tenantId)
+> GetEmailTemplateDefinitionsResponse getEmailTemplateDefinitions(ApiGetEmailTemplateDefinitionsRequest)
 
 
 
@@ -2567,7 +2567,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getEmailTemplateDefinitions(tenantId);
+    final result = api_instance.getEmailTemplateDefinitions(ApiGetEmailTemplateDefinitionsRequest(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplateDefinitions: $e\n');
@@ -2596,7 +2596,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplateRenderErrors**
-> GetEmailTemplateRenderErrorsResponse getEmailTemplateRenderErrors(tenantId, id, skip)
+> GetEmailTemplateRenderErrorsResponse getEmailTemplateRenderErrors(ApiGetEmailTemplateRenderErrorsRequest)
 
 
 
@@ -2614,7 +2614,7 @@ final id = id_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getEmailTemplateRenderErrors(tenantId, id, skip);
+    final result = api_instance.getEmailTemplateRenderErrors(ApiGetEmailTemplateRenderErrorsRequest(tenantId: tenantId, id: id, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplateRenderErrors: $e\n');
@@ -2645,7 +2645,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplates**
-> GetEmailTemplatesResponse getEmailTemplates(tenantId, skip)
+> GetEmailTemplatesResponse getEmailTemplates(ApiGetEmailTemplatesRequest)
 
 
 
@@ -2662,7 +2662,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getEmailTemplates(tenantId, skip);
+    final result = api_instance.getEmailTemplates(ApiGetEmailTemplatesRequest(tenantId: tenantId, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplates: $e\n');
@@ -2692,7 +2692,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPosts**
-> GetFeedPostsResponse getFeedPosts(tenantId, afterId, limit, tags)
+> GetFeedPostsResponse getFeedPosts(ApiGetFeedPostsRequest)
 
 
 
@@ -2713,7 +2713,7 @@ final limit = 56; // int |
 final tags = []; // List<String> | 
 
 try {
-    final result = api_instance.getFeedPosts(tenantId, afterId, limit, tags);
+    final result = api_instance.getFeedPosts(ApiGetFeedPostsRequest(tenantId: tenantId, afterId: afterId, limit: limit, tags: tags));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getFeedPosts: $e\n');
@@ -2745,7 +2745,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getHashTags**
-> GetHashTagsResponse getHashTags(tenantId, page)
+> GetHashTagsResponse getHashTags(ApiGetHashTagsRequest)
 
 
 
@@ -2762,7 +2762,7 @@ final tenantId = tenantId_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getHashTags(tenantId, page);
+    final result = api_instance.getHashTags(ApiGetHashTagsRequest(tenantId: tenantId, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getHashTags: $e\n');
@@ -2792,7 +2792,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerator**
-> GetModeratorResponse getModerator(tenantId, id)
+> GetModeratorResponse getModerator(ApiGetModeratorRequest)
 
 
 
@@ -2809,7 +2809,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getModerator(tenantId, id);
+    final result = api_instance.getModerator(ApiGetModeratorRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getModerator: $e\n');
@@ -2839,7 +2839,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerators**
-> GetModeratorsResponse getModerators(tenantId, skip)
+> GetModeratorsResponse getModerators(ApiGetModeratorsRequest)
 
 
 
@@ -2856,7 +2856,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getModerators(tenantId, skip);
+    final result = api_instance.getModerators(ApiGetModeratorsRequest(tenantId: tenantId, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getModerators: $e\n');
@@ -2886,7 +2886,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getNotificationCount**
-> GetNotificationCountResponse getNotificationCount(tenantId, userId, urlId, fromCommentId, viewed, type)
+> GetNotificationCountResponse getNotificationCount(ApiGetNotificationCountRequest)
 
 
 
@@ -2907,7 +2907,7 @@ final viewed = true; // bool |
 final type = type_example; // String | 
 
 try {
-    final result = api_instance.getNotificationCount(tenantId, userId, urlId, fromCommentId, viewed, type);
+    final result = api_instance.getNotificationCount(ApiGetNotificationCountRequest(tenantId: tenantId, userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getNotificationCount: $e\n');
@@ -2941,7 +2941,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getNotifications**
-> GetNotificationsResponse getNotifications(tenantId, userId, urlId, fromCommentId, viewed, type, skip)
+> GetNotificationsResponse getNotifications(ApiGetNotificationsRequest)
 
 
 
@@ -2963,7 +2963,7 @@ final type = type_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getNotifications(tenantId, userId, urlId, fromCommentId, viewed, type, skip);
+    final result = api_instance.getNotifications(ApiGetNotificationsRequest(tenantId: tenantId, userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getNotifications: $e\n');
@@ -2998,7 +2998,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPageByURLId**
-> GetPageByURLIdAPIResponse getPageByURLId(tenantId, urlId)
+> GetPageByURLIdAPIResponse getPageByURLId(ApiGetPageByURLIdRequest)
 
 
 
@@ -3015,7 +3015,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getPageByURLId(tenantId, urlId);
+    final result = api_instance.getPageByURLId(ApiGetPageByURLIdRequest(tenantId: tenantId, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPageByURLId: $e\n');
@@ -3045,7 +3045,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPages**
-> GetPagesAPIResponse getPages(tenantId)
+> GetPagesAPIResponse getPages(ApiGetPagesRequest)
 
 
 
@@ -3061,7 +3061,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getPages(tenantId);
+    final result = api_instance.getPages(ApiGetPagesRequest(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPages: $e\n');
@@ -3090,7 +3090,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPendingWebhookEventCount**
-> GetPendingWebhookEventCountResponse getPendingWebhookEventCount(tenantId, commentId, externalId, eventType, type, domain, attemptCountGT)
+> GetPendingWebhookEventCountResponse getPendingWebhookEventCount(ApiGetPendingWebhookEventCountRequest)
 
 
 
@@ -3112,7 +3112,7 @@ final domain = domain_example; // String |
 final attemptCountGT = 1.2; // double | 
 
 try {
-    final result = api_instance.getPendingWebhookEventCount(tenantId, commentId, externalId, eventType, type, domain, attemptCountGT);
+    final result = api_instance.getPendingWebhookEventCount(ApiGetPendingWebhookEventCountRequest(tenantId: tenantId, commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPendingWebhookEventCount: $e\n');
@@ -3147,7 +3147,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPendingWebhookEvents**
-> GetPendingWebhookEventsResponse getPendingWebhookEvents(tenantId, commentId, externalId, eventType, type, domain, attemptCountGT, skip)
+> GetPendingWebhookEventsResponse getPendingWebhookEvents(ApiGetPendingWebhookEventsRequest)
 
 
 
@@ -3170,7 +3170,7 @@ final attemptCountGT = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getPendingWebhookEvents(tenantId, commentId, externalId, eventType, type, domain, attemptCountGT, skip);
+    final result = api_instance.getPendingWebhookEvents(ApiGetPendingWebhookEventsRequest(tenantId: tenantId, commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPendingWebhookEvents: $e\n');
@@ -3206,7 +3206,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionConfig**
-> GetQuestionConfigResponse getQuestionConfig(tenantId, id)
+> GetQuestionConfigResponse getQuestionConfig(ApiGetQuestionConfigRequest)
 
 
 
@@ -3223,7 +3223,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getQuestionConfig(tenantId, id);
+    final result = api_instance.getQuestionConfig(ApiGetQuestionConfigRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionConfig: $e\n');
@@ -3253,7 +3253,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionConfigs**
-> GetQuestionConfigsResponse getQuestionConfigs(tenantId, skip)
+> GetQuestionConfigsResponse getQuestionConfigs(ApiGetQuestionConfigsRequest)
 
 
 
@@ -3270,7 +3270,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getQuestionConfigs(tenantId, skip);
+    final result = api_instance.getQuestionConfigs(ApiGetQuestionConfigsRequest(tenantId: tenantId, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionConfigs: $e\n');
@@ -3300,7 +3300,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionResult**
-> GetQuestionResultResponse getQuestionResult(tenantId, id)
+> GetQuestionResultResponse getQuestionResult(ApiGetQuestionResultRequest)
 
 
 
@@ -3317,7 +3317,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getQuestionResult(tenantId, id);
+    final result = api_instance.getQuestionResult(ApiGetQuestionResultRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionResult: $e\n');
@@ -3347,7 +3347,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionResults**
-> GetQuestionResultsResponse getQuestionResults(tenantId, urlId, userId, startDate, questionId, questionIds, skip)
+> GetQuestionResultsResponse getQuestionResults(ApiGetQuestionResultsRequest)
 
 
 
@@ -3369,7 +3369,7 @@ final questionIds = questionIds_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getQuestionResults(tenantId, urlId, userId, startDate, questionId, questionIds, skip);
+    final result = api_instance.getQuestionResults(ApiGetQuestionResultsRequest(tenantId: tenantId, urlId: urlId, userId: userId, startDate: startDate, questionId: questionId, questionIds: questionIds, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionResults: $e\n');
@@ -3404,7 +3404,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUserByEmail**
-> GetSSOUserByEmailAPIResponse getSSOUserByEmail(tenantId, email)
+> GetSSOUserByEmailAPIResponse getSSOUserByEmail(ApiGetSSOUserByEmailRequest)
 
 
 
@@ -3421,7 +3421,7 @@ final tenantId = tenantId_example; // String |
 final email = email_example; // String | 
 
 try {
-    final result = api_instance.getSSOUserByEmail(tenantId, email);
+    final result = api_instance.getSSOUserByEmail(ApiGetSSOUserByEmailRequest(tenantId: tenantId, email: email));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUserByEmail: $e\n');
@@ -3451,7 +3451,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUserById**
-> GetSSOUserByIdAPIResponse getSSOUserById(tenantId, id)
+> GetSSOUserByIdAPIResponse getSSOUserById(ApiGetSSOUserByIdRequest)
 
 
 
@@ -3468,7 +3468,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getSSOUserById(tenantId, id);
+    final result = api_instance.getSSOUserById(ApiGetSSOUserByIdRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUserById: $e\n');
@@ -3498,7 +3498,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUsers**
-> GetSSOUsersResponse getSSOUsers(tenantId, skip)
+> GetSSOUsersResponse getSSOUsers(ApiGetSSOUsersRequest)
 
 
 
@@ -3515,7 +3515,7 @@ final tenantId = tenantId_example; // String |
 final skip = 56; // int | 
 
 try {
-    final result = api_instance.getSSOUsers(tenantId, skip);
+    final result = api_instance.getSSOUsers(ApiGetSSOUsersRequest(tenantId: tenantId, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUsers: $e\n');
@@ -3545,7 +3545,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSubscriptions**
-> GetSubscriptionsAPIResponse getSubscriptions(tenantId, userId)
+> GetSubscriptionsAPIResponse getSubscriptions(ApiGetSubscriptionsRequest)
 
 
 
@@ -3562,7 +3562,7 @@ final tenantId = tenantId_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getSubscriptions(tenantId, userId);
+    final result = api_instance.getSubscriptions(ApiGetSubscriptionsRequest(tenantId: tenantId, userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSubscriptions: $e\n');
@@ -3592,7 +3592,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenant**
-> GetTenantResponse getTenant(tenantId, id)
+> GetTenantResponse getTenant(ApiGetTenantRequest)
 
 
 
@@ -3609,7 +3609,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenant(tenantId, id);
+    final result = api_instance.getTenant(ApiGetTenantRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenant: $e\n');
@@ -3639,7 +3639,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantDailyUsages**
-> GetTenantDailyUsagesResponse getTenantDailyUsages(tenantId, yearNumber, monthNumber, dayNumber, skip)
+> GetTenantDailyUsagesResponse getTenantDailyUsages(ApiGetTenantDailyUsagesRequest)
 
 
 
@@ -3659,7 +3659,7 @@ final dayNumber = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantDailyUsages(tenantId, yearNumber, monthNumber, dayNumber, skip);
+    final result = api_instance.getTenantDailyUsages(ApiGetTenantDailyUsagesRequest(tenantId: tenantId, yearNumber: yearNumber, monthNumber: monthNumber, dayNumber: dayNumber, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantDailyUsages: $e\n');
@@ -3692,7 +3692,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantPackage**
-> GetTenantPackageResponse getTenantPackage(tenantId, id)
+> GetTenantPackageResponse getTenantPackage(ApiGetTenantPackageRequest)
 
 
 
@@ -3709,7 +3709,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenantPackage(tenantId, id);
+    final result = api_instance.getTenantPackage(ApiGetTenantPackageRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantPackage: $e\n');
@@ -3739,7 +3739,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantPackages**
-> GetTenantPackagesResponse getTenantPackages(tenantId, skip)
+> GetTenantPackagesResponse getTenantPackages(ApiGetTenantPackagesRequest)
 
 
 
@@ -3756,7 +3756,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantPackages(tenantId, skip);
+    final result = api_instance.getTenantPackages(ApiGetTenantPackagesRequest(tenantId: tenantId, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantPackages: $e\n');
@@ -3786,7 +3786,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantUser**
-> GetTenantUserResponse getTenantUser(tenantId, id)
+> GetTenantUserResponse getTenantUser(ApiGetTenantUserRequest)
 
 
 
@@ -3803,7 +3803,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenantUser(tenantId, id);
+    final result = api_instance.getTenantUser(ApiGetTenantUserRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantUser: $e\n');
@@ -3833,7 +3833,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantUsers**
-> GetTenantUsersResponse getTenantUsers(tenantId, skip)
+> GetTenantUsersResponse getTenantUsers(ApiGetTenantUsersRequest)
 
 
 
@@ -3850,7 +3850,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantUsers(tenantId, skip);
+    final result = api_instance.getTenantUsers(ApiGetTenantUsersRequest(tenantId: tenantId, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantUsers: $e\n');
@@ -3880,7 +3880,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenants**
-> GetTenantsResponse getTenants(tenantId, meta, skip)
+> GetTenantsResponse getTenants(ApiGetTenantsRequest)
 
 
 
@@ -3898,7 +3898,7 @@ final meta = meta_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenants(tenantId, meta, skip);
+    final result = api_instance.getTenants(ApiGetTenantsRequest(tenantId: tenantId, meta: meta, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenants: $e\n');
@@ -3929,7 +3929,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTicket**
-> GetTicketResponse getTicket(tenantId, id, userId)
+> GetTicketResponse getTicket(ApiGetTicketRequest)
 
 
 
@@ -3947,7 +3947,7 @@ final id = id_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getTicket(tenantId, id, userId);
+    final result = api_instance.getTicket(ApiGetTicketRequest(tenantId: tenantId, id: id, userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTicket: $e\n');
@@ -3978,7 +3978,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTickets**
-> GetTicketsResponse getTickets(tenantId, userId, state, skip, limit)
+> GetTicketsResponse getTickets(ApiGetTicketsRequest)
 
 
 
@@ -3998,7 +3998,7 @@ final skip = 1.2; // double |
 final limit = 1.2; // double | 
 
 try {
-    final result = api_instance.getTickets(tenantId, userId, state, skip, limit);
+    final result = api_instance.getTickets(ApiGetTicketsRequest(tenantId: tenantId, userId: userId, state: state, skip: skip, limit: limit));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTickets: $e\n');
@@ -4031,7 +4031,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUser**
-> GetUserResponse getUser(tenantId, id)
+> GetUserResponse getUser(ApiGetUserRequest)
 
 
 
@@ -4048,7 +4048,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUser(tenantId, id);
+    final result = api_instance.getUser(ApiGetUserRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUser: $e\n');
@@ -4078,7 +4078,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadge**
-> APIGetUserBadgeResponse getUserBadge(tenantId, id)
+> APIGetUserBadgeResponse getUserBadge(ApiGetUserBadgeRequest)
 
 
 
@@ -4095,7 +4095,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUserBadge(tenantId, id);
+    final result = api_instance.getUserBadge(ApiGetUserBadgeRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadge: $e\n');
@@ -4125,7 +4125,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressById**
-> APIGetUserBadgeProgressResponse getUserBadgeProgressById(tenantId, id)
+> APIGetUserBadgeProgressResponse getUserBadgeProgressById(ApiGetUserBadgeProgressByIdRequest)
 
 
 
@@ -4142,7 +4142,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUserBadgeProgressById(tenantId, id);
+    final result = api_instance.getUserBadgeProgressById(ApiGetUserBadgeProgressByIdRequest(tenantId: tenantId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressById: $e\n');
@@ -4172,7 +4172,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressByUserId**
-> APIGetUserBadgeProgressResponse getUserBadgeProgressByUserId(tenantId, userId)
+> APIGetUserBadgeProgressResponse getUserBadgeProgressByUserId(ApiGetUserBadgeProgressByUserIdRequest)
 
 
 
@@ -4189,7 +4189,7 @@ final tenantId = tenantId_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getUserBadgeProgressByUserId(tenantId, userId);
+    final result = api_instance.getUserBadgeProgressByUserId(ApiGetUserBadgeProgressByUserIdRequest(tenantId: tenantId, userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressByUserId: $e\n');
@@ -4219,7 +4219,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressList**
-> APIGetUserBadgeProgressListResponse getUserBadgeProgressList(tenantId, userId, limit, skip)
+> APIGetUserBadgeProgressListResponse getUserBadgeProgressList(ApiGetUserBadgeProgressListRequest)
 
 
 
@@ -4238,7 +4238,7 @@ final limit = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getUserBadgeProgressList(tenantId, userId, limit, skip);
+    final result = api_instance.getUserBadgeProgressList(ApiGetUserBadgeProgressListRequest(tenantId: tenantId, userId: userId, limit: limit, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressList: $e\n');
@@ -4270,7 +4270,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadges**
-> APIGetUserBadgesResponse getUserBadges(tenantId, userId, badgeId, type, displayedOnComments, limit, skip)
+> APIGetUserBadgesResponse getUserBadges(ApiGetUserBadgesRequest)
 
 
 
@@ -4292,7 +4292,7 @@ final limit = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getUserBadges(tenantId, userId, badgeId, type, displayedOnComments, limit, skip);
+    final result = api_instance.getUserBadges(ApiGetUserBadgesRequest(tenantId: tenantId, userId: userId, badgeId: badgeId, type: type, displayedOnComments: displayedOnComments, limit: limit, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadges: $e\n');
@@ -4327,7 +4327,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getVotes**
-> GetVotesResponse getVotes(tenantId, urlId)
+> GetVotesResponse getVotes(ApiGetVotesRequest)
 
 
 
@@ -4344,7 +4344,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getVotes(tenantId, urlId);
+    final result = api_instance.getVotes(ApiGetVotesRequest(tenantId: tenantId, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getVotes: $e\n');
@@ -4374,7 +4374,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getVotesForUser**
-> GetVotesForUserResponse getVotesForUser(tenantId, urlId, userId, anonUserId)
+> GetVotesForUserResponse getVotesForUser(ApiGetVotesForUserRequest)
 
 
 
@@ -4393,7 +4393,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.getVotesForUser(tenantId, urlId, userId, anonUserId);
+    final result = api_instance.getVotesForUser(ApiGetVotesForUserRequest(tenantId: tenantId, urlId: urlId, userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getVotesForUser: $e\n');
@@ -4425,7 +4425,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchDomainConfig**
-> PatchDomainConfigResponse patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams)
+> PatchDomainConfigResponse patchDomainConfig(ApiPatchDomainConfigRequest)
 
 
 
@@ -4443,7 +4443,7 @@ final domainToUpdate = domainToUpdate_example; // String |
 final patchDomainConfigParams = PatchDomainConfigParams(); // PatchDomainConfigParams | 
 
 try {
-    final result = api_instance.patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams);
+    final result = api_instance.patchDomainConfig(ApiPatchDomainConfigRequest(tenantId: tenantId, domainToUpdate: domainToUpdate, patchDomainConfigParams: patchDomainConfigParams));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchDomainConfig: $e\n');
@@ -4474,7 +4474,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchHashTag**
-> UpdateHashTagResponse patchHashTag(tag, tenantId, updateHashTagBody)
+> UpdateHashTagResponse patchHashTag(ApiPatchHashTagRequest)
 
 
 
@@ -4492,7 +4492,7 @@ final tenantId = tenantId_example; // String |
 final updateHashTagBody = UpdateHashTagBody(); // UpdateHashTagBody | 
 
 try {
-    final result = api_instance.patchHashTag(tag, tenantId, updateHashTagBody);
+    final result = api_instance.patchHashTag(ApiPatchHashTagRequest(tag: tag, tenantId: tenantId, updateHashTagBody: updateHashTagBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchHashTag: $e\n');
@@ -4523,7 +4523,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchPage**
-> PatchPageAPIResponse patchPage(tenantId, id, updateAPIPageData)
+> PatchPageAPIResponse patchPage(ApiPatchPageRequest)
 
 
 
@@ -4541,7 +4541,7 @@ final id = id_example; // String |
 final updateAPIPageData = UpdateAPIPageData(); // UpdateAPIPageData | 
 
 try {
-    final result = api_instance.patchPage(tenantId, id, updateAPIPageData);
+    final result = api_instance.patchPage(ApiPatchPageRequest(tenantId: tenantId, id: id, updateAPIPageData: updateAPIPageData));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchPage: $e\n');
@@ -4572,7 +4572,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchSSOUser**
-> PatchSSOUserAPIResponse patchSSOUser(tenantId, id, updateAPISSOUserData, updateComments)
+> PatchSSOUserAPIResponse patchSSOUser(ApiPatchSSOUserRequest)
 
 
 
@@ -4591,7 +4591,7 @@ final updateAPISSOUserData = UpdateAPISSOUserData(); // UpdateAPISSOUserData |
 final updateComments = true; // bool | 
 
 try {
-    final result = api_instance.patchSSOUser(tenantId, id, updateAPISSOUserData, updateComments);
+    final result = api_instance.patchSSOUser(ApiPatchSSOUserRequest(tenantId: tenantId, id: id, updateAPISSOUserData: updateAPISSOUserData, updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchSSOUser: $e\n');
@@ -4623,7 +4623,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putDomainConfig**
-> PutDomainConfigResponse putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams)
+> PutDomainConfigResponse putDomainConfig(ApiPutDomainConfigRequest)
 
 
 
@@ -4641,7 +4641,7 @@ final domainToUpdate = domainToUpdate_example; // String |
 final updateDomainConfigParams = UpdateDomainConfigParams(); // UpdateDomainConfigParams | 
 
 try {
-    final result = api_instance.putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams);
+    final result = api_instance.putDomainConfig(ApiPutDomainConfigRequest(tenantId: tenantId, domainToUpdate: domainToUpdate, updateDomainConfigParams: updateDomainConfigParams));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->putDomainConfig: $e\n');
@@ -4672,7 +4672,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putSSOUser**
-> PutSSOUserAPIResponse putSSOUser(tenantId, id, updateAPISSOUserData, updateComments)
+> PutSSOUserAPIResponse putSSOUser(ApiPutSSOUserRequest)
 
 
 
@@ -4691,7 +4691,7 @@ final updateAPISSOUserData = UpdateAPISSOUserData(); // UpdateAPISSOUserData |
 final updateComments = true; // bool | 
 
 try {
-    final result = api_instance.putSSOUser(tenantId, id, updateAPISSOUserData, updateComments);
+    final result = api_instance.putSSOUser(ApiPutSSOUserRequest(tenantId: tenantId, id: id, updateAPISSOUserData: updateAPISSOUserData, updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->putSSOUser: $e\n');
@@ -4723,7 +4723,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **renderEmailTemplate**
-> RenderEmailTemplateResponse renderEmailTemplate(tenantId, renderEmailTemplateBody, locale)
+> RenderEmailTemplateResponse renderEmailTemplate(ApiRenderEmailTemplateRequest)
 
 
 
@@ -4741,7 +4741,7 @@ final renderEmailTemplateBody = RenderEmailTemplateBody(); // RenderEmailTemplat
 final locale = locale_example; // String | 
 
 try {
-    final result = api_instance.renderEmailTemplate(tenantId, renderEmailTemplateBody, locale);
+    final result = api_instance.renderEmailTemplate(ApiRenderEmailTemplateRequest(tenantId: tenantId, renderEmailTemplateBody: renderEmailTemplateBody, locale: locale));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->renderEmailTemplate: $e\n');
@@ -4772,7 +4772,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **replaceTenantPackage**
-> APIEmptyResponse replaceTenantPackage(tenantId, id, replaceTenantPackageBody)
+> APIEmptyResponse replaceTenantPackage(ApiReplaceTenantPackageRequest)
 
 
 
@@ -4790,7 +4790,7 @@ final id = id_example; // String |
 final replaceTenantPackageBody = ReplaceTenantPackageBody(); // ReplaceTenantPackageBody | 
 
 try {
-    final result = api_instance.replaceTenantPackage(tenantId, id, replaceTenantPackageBody);
+    final result = api_instance.replaceTenantPackage(ApiReplaceTenantPackageRequest(tenantId: tenantId, id: id, replaceTenantPackageBody: replaceTenantPackageBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->replaceTenantPackage: $e\n');
@@ -4821,7 +4821,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **replaceTenantUser**
-> APIEmptyResponse replaceTenantUser(tenantId, id, replaceTenantUserBody, updateComments)
+> APIEmptyResponse replaceTenantUser(ApiReplaceTenantUserRequest)
 
 
 
@@ -4840,7 +4840,7 @@ final replaceTenantUserBody = ReplaceTenantUserBody(); // ReplaceTenantUserBody
 final updateComments = updateComments_example; // String | 
 
 try {
-    final result = api_instance.replaceTenantUser(tenantId, id, replaceTenantUserBody, updateComments);
+    final result = api_instance.replaceTenantUser(ApiReplaceTenantUserRequest(tenantId: tenantId, id: id, replaceTenantUserBody: replaceTenantUserBody, updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->replaceTenantUser: $e\n');
@@ -4872,7 +4872,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **saveComment**
-> APISaveCommentResponse saveComment(tenantId, createCommentParams, isLive, doSpamCheck, sendEmails, populateNotifications)
+> APISaveCommentResponse saveComment(ApiSaveCommentRequest)
 
 
 
@@ -4893,7 +4893,7 @@ final sendEmails = true; // bool |
 final populateNotifications = true; // bool | 
 
 try {
-    final result = api_instance.saveComment(tenantId, createCommentParams, isLive, doSpamCheck, sendEmails, populateNotifications);
+    final result = api_instance.saveComment(ApiSaveCommentRequest(tenantId: tenantId, createCommentParams: createCommentParams, isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->saveComment: $e\n');
@@ -4927,7 +4927,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **saveCommentsBulk**
-> List<SaveCommentsBulkResponse> saveCommentsBulk(tenantId, createCommentParams, isLive, doSpamCheck, sendEmails, populateNotifications)
+> List<SaveCommentsBulkResponse> saveCommentsBulk(ApiSaveCommentsBulkRequest)
 
 
 
@@ -4948,7 +4948,7 @@ final sendEmails = true; // bool |
 final populateNotifications = true; // bool | 
 
 try {
-    final result = api_instance.saveCommentsBulk(tenantId, createCommentParams, isLive, doSpamCheck, sendEmails, populateNotifications);
+    final result = api_instance.saveCommentsBulk(ApiSaveCommentsBulkRequest(tenantId: tenantId, createCommentParams: createCommentParams, isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->saveCommentsBulk: $e\n');
@@ -4982,7 +4982,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **sendInvite**
-> APIEmptyResponse sendInvite(tenantId, id, fromName)
+> APIEmptyResponse sendInvite(ApiSendInviteRequest)
 
 
 
@@ -5000,7 +5000,7 @@ final id = id_example; // String |
 final fromName = fromName_example; // String | 
 
 try {
-    final result = api_instance.sendInvite(tenantId, id, fromName);
+    final result = api_instance.sendInvite(ApiSendInviteRequest(tenantId: tenantId, id: id, fromName: fromName));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->sendInvite: $e\n');
@@ -5031,7 +5031,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **sendLoginLink**
-> APIEmptyResponse sendLoginLink(tenantId, id, redirectURL)
+> APIEmptyResponse sendLoginLink(ApiSendLoginLinkRequest)
 
 
 
@@ -5049,7 +5049,7 @@ final id = id_example; // String |
 final redirectURL = redirectURL_example; // String | 
 
 try {
-    final result = api_instance.sendLoginLink(tenantId, id, redirectURL);
+    final result = api_instance.sendLoginLink(ApiSendLoginLinkRequest(tenantId: tenantId, id: id, redirectURL: redirectURL));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->sendLoginLink: $e\n');
@@ -5080,7 +5080,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unBlockUserFromComment**
-> UnblockSuccess unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, userId, anonUserId)
+> UnblockSuccess unBlockUserFromComment(ApiUnBlockUserFromCommentRequest)
 
 
 
@@ -5100,7 +5100,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, userId, anonUserId);
+    final result = api_instance.unBlockUserFromComment(ApiUnBlockUserFromCommentRequest(tenantId: tenantId, id: id, unBlockFromCommentParams: unBlockFromCommentParams, userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->unBlockUserFromComment: $e\n');
@@ -5133,7 +5133,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unFlagComment**
-> FlagCommentResponse unFlagComment(tenantId, id, userId, anonUserId)
+> FlagCommentResponse unFlagComment(ApiUnFlagCommentRequest)
 
 
 
@@ -5152,7 +5152,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.unFlagComment(tenantId, id, userId, anonUserId);
+    final result = api_instance.unFlagComment(ApiUnFlagCommentRequest(tenantId: tenantId, id: id, userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->unFlagComment: $e\n');
@@ -5184,7 +5184,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateComment**
-> APIEmptyResponse updateComment(tenantId, id, updatableCommentParams, contextUserId, doSpamCheck, isLive)
+> APIEmptyResponse updateComment(ApiUpdateCommentRequest)
 
 
 
@@ -5205,7 +5205,7 @@ final doSpamCheck = true; // bool |
 final isLive = true; // bool | 
 
 try {
-    final result = api_instance.updateComment(tenantId, id, updatableCommentParams, contextUserId, doSpamCheck, isLive);
+    final result = api_instance.updateComment(ApiUpdateCommentRequest(tenantId: tenantId, id: id, updatableCommentParams: updatableCommentParams, contextUserId: contextUserId, doSpamCheck: doSpamCheck, isLive: isLive));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateComment: $e\n');
@@ -5239,7 +5239,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateEmailTemplate**
-> APIEmptyResponse updateEmailTemplate(tenantId, id, updateEmailTemplateBody)
+> APIEmptyResponse updateEmailTemplate(ApiUpdateEmailTemplateRequest)
 
 
 
@@ -5257,7 +5257,7 @@ final id = id_example; // String |
 final updateEmailTemplateBody = UpdateEmailTemplateBody(); // UpdateEmailTemplateBody | 
 
 try {
-    final result = api_instance.updateEmailTemplate(tenantId, id, updateEmailTemplateBody);
+    final result = api_instance.updateEmailTemplate(ApiUpdateEmailTemplateRequest(tenantId: tenantId, id: id, updateEmailTemplateBody: updateEmailTemplateBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateEmailTemplate: $e\n');
@@ -5288,7 +5288,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateFeedPost**
-> APIEmptyResponse updateFeedPost(tenantId, id, feedPost)
+> APIEmptyResponse updateFeedPost(ApiUpdateFeedPostRequest)
 
 
 
@@ -5306,7 +5306,7 @@ final id = id_example; // String |
 final feedPost = FeedPost(); // FeedPost | 
 
 try {
-    final result = api_instance.updateFeedPost(tenantId, id, feedPost);
+    final result = api_instance.updateFeedPost(ApiUpdateFeedPostRequest(tenantId: tenantId, id: id, feedPost: feedPost));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateFeedPost: $e\n');
@@ -5337,7 +5337,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateModerator**
-> APIEmptyResponse updateModerator(tenantId, id, updateModeratorBody)
+> APIEmptyResponse updateModerator(ApiUpdateModeratorRequest)
 
 
 
@@ -5355,7 +5355,7 @@ final id = id_example; // String |
 final updateModeratorBody = UpdateModeratorBody(); // UpdateModeratorBody | 
 
 try {
-    final result = api_instance.updateModerator(tenantId, id, updateModeratorBody);
+    final result = api_instance.updateModerator(ApiUpdateModeratorRequest(tenantId: tenantId, id: id, updateModeratorBody: updateModeratorBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateModerator: $e\n');
@@ -5386,7 +5386,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateNotification**
-> APIEmptyResponse updateNotification(tenantId, id, updateNotificationBody, userId)
+> APIEmptyResponse updateNotification(ApiUpdateNotificationRequest)
 
 
 
@@ -5405,7 +5405,7 @@ final updateNotificationBody = UpdateNotificationBody(); // UpdateNotificationBo
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.updateNotification(tenantId, id, updateNotificationBody, userId);
+    final result = api_instance.updateNotification(ApiUpdateNotificationRequest(tenantId: tenantId, id: id, updateNotificationBody: updateNotificationBody, userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateNotification: $e\n');
@@ -5437,7 +5437,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateQuestionConfig**
-> APIEmptyResponse updateQuestionConfig(tenantId, id, updateQuestionConfigBody)
+> APIEmptyResponse updateQuestionConfig(ApiUpdateQuestionConfigRequest)
 
 
 
@@ -5455,7 +5455,7 @@ final id = id_example; // String |
 final updateQuestionConfigBody = UpdateQuestionConfigBody(); // UpdateQuestionConfigBody | 
 
 try {
-    final result = api_instance.updateQuestionConfig(tenantId, id, updateQuestionConfigBody);
+    final result = api_instance.updateQuestionConfig(ApiUpdateQuestionConfigRequest(tenantId: tenantId, id: id, updateQuestionConfigBody: updateQuestionConfigBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateQuestionConfig: $e\n');
@@ -5486,7 +5486,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateQuestionResult**
-> APIEmptyResponse updateQuestionResult(tenantId, id, updateQuestionResultBody)
+> APIEmptyResponse updateQuestionResult(ApiUpdateQuestionResultRequest)
 
 
 
@@ -5504,7 +5504,7 @@ final id = id_example; // String |
 final updateQuestionResultBody = UpdateQuestionResultBody(); // UpdateQuestionResultBody | 
 
 try {
-    final result = api_instance.updateQuestionResult(tenantId, id, updateQuestionResultBody);
+    final result = api_instance.updateQuestionResult(ApiUpdateQuestionResultRequest(tenantId: tenantId, id: id, updateQuestionResultBody: updateQuestionResultBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateQuestionResult: $e\n');
@@ -5535,7 +5535,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateSubscription**
-> UpdateSubscriptionAPIResponse updateSubscription(tenantId, id, updateAPIUserSubscriptionData, userId)
+> UpdateSubscriptionAPIResponse updateSubscription(ApiUpdateSubscriptionRequest)
 
 
 
@@ -5554,7 +5554,7 @@ final updateAPIUserSubscriptionData = UpdateAPIUserSubscriptionData(); // Update
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.updateSubscription(tenantId, id, updateAPIUserSubscriptionData, userId);
+    final result = api_instance.updateSubscription(ApiUpdateSubscriptionRequest(tenantId: tenantId, id: id, updateAPIUserSubscriptionData: updateAPIUserSubscriptionData, userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateSubscription: $e\n');
@@ -5586,7 +5586,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenant**
-> APIEmptyResponse updateTenant(tenantId, id, updateTenantBody)
+> APIEmptyResponse updateTenant(ApiUpdateTenantRequest)
 
 
 
@@ -5604,7 +5604,7 @@ final id = id_example; // String |
 final updateTenantBody = UpdateTenantBody(); // UpdateTenantBody | 
 
 try {
-    final result = api_instance.updateTenant(tenantId, id, updateTenantBody);
+    final result = api_instance.updateTenant(ApiUpdateTenantRequest(tenantId: tenantId, id: id, updateTenantBody: updateTenantBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenant: $e\n');
@@ -5635,7 +5635,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenantPackage**
-> APIEmptyResponse updateTenantPackage(tenantId, id, updateTenantPackageBody)
+> APIEmptyResponse updateTenantPackage(ApiUpdateTenantPackageRequest)
 
 
 
@@ -5653,7 +5653,7 @@ final id = id_example; // String |
 final updateTenantPackageBody = UpdateTenantPackageBody(); // UpdateTenantPackageBody | 
 
 try {
-    final result = api_instance.updateTenantPackage(tenantId, id, updateTenantPackageBody);
+    final result = api_instance.updateTenantPackage(ApiUpdateTenantPackageRequest(tenantId: tenantId, id: id, updateTenantPackageBody: updateTenantPackageBody));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenantPackage: $e\n');
@@ -5684,7 +5684,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenantUser**
-> APIEmptyResponse updateTenantUser(tenantId, id, updateTenantUserBody, updateComments)
+> APIEmptyResponse updateTenantUser(ApiUpdateTenantUserRequest)
 
 
 
@@ -5703,7 +5703,7 @@ final updateTenantUserBody = UpdateTenantUserBody(); // UpdateTenantUserBody |
 final updateComments = updateComments_example; // String | 
 
 try {
-    final result = api_instance.updateTenantUser(tenantId, id, updateTenantUserBody, updateComments);
+    final result = api_instance.updateTenantUser(ApiUpdateTenantUserRequest(tenantId: tenantId, id: id, updateTenantUserBody: updateTenantUserBody, updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenantUser: $e\n');
@@ -5735,7 +5735,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserBadge**
-> APIEmptySuccessResponse updateUserBadge(tenantId, id, updateUserBadgeParams)
+> APIEmptySuccessResponse updateUserBadge(ApiUpdateUserBadgeRequest)
 
 
 
@@ -5753,7 +5753,7 @@ final id = id_example; // String |
 final updateUserBadgeParams = UpdateUserBadgeParams(); // UpdateUserBadgeParams | 
 
 try {
-    final result = api_instance.updateUserBadge(tenantId, id, updateUserBadgeParams);
+    final result = api_instance.updateUserBadge(ApiUpdateUserBadgeRequest(tenantId: tenantId, id: id, updateUserBadgeParams: updateUserBadgeParams));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateUserBadge: $e\n');
diff --git a/client/doc/ModerationApi.md b/client/doc/ModerationApi.md
index 8112bdd..9b18940 100644
--- a/client/doc/ModerationApi.md
+++ b/client/doc/ModerationApi.md
@@ -55,7 +55,7 @@ Method | HTTP request | Description
 
 
 # **deleteModerationVote**
-> VoteDeleteResponse deleteModerationVote(commentId, voteId, tenantId, broadcastId, sso)
+> VoteDeleteResponse deleteModerationVote(ApiDeleteModerationVoteRequest)
 
 
 
@@ -71,7 +71,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteModerationVote(commentId, voteId, tenantId, broadcastId, sso);
+    final result = api_instance.deleteModerationVote(ApiDeleteModerationVoteRequest(commentId: commentId, voteId: voteId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->deleteModerationVote: $e\n');
@@ -104,7 +104,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiComments**
-> ModerationAPIGetCommentsResponse getApiComments(page, count, textSearch, byIPFromComment, filters, searchFilters, sorts, demo, tenantId, sso)
+> ModerationAPIGetCommentsResponse getApiComments(ApiGetApiCommentsRequest)
 
 
 
@@ -125,7 +125,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiComments(page, count, textSearch, byIPFromComment, filters, searchFilters, sorts, demo, tenantId, sso);
+    final result = api_instance.getApiComments(ApiGetApiCommentsRequest(page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiComments: $e\n');
@@ -163,7 +163,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiExportStatus**
-> ModerationExportStatusResponse getApiExportStatus(batchJobId, tenantId, sso)
+> ModerationExportStatusResponse getApiExportStatus(ApiGetApiExportStatusRequest)
 
 
 
@@ -177,7 +177,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiExportStatus(batchJobId, tenantId, sso);
+    final result = api_instance.getApiExportStatus(ApiGetApiExportStatusRequest(batchJobId: batchJobId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiExportStatus: $e\n');
@@ -208,7 +208,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiIds**
-> ModerationAPIGetCommentIdsResponse getApiIds(textSearch, byIPFromComment, filters, searchFilters, afterId, demo, tenantId, sso)
+> ModerationAPIGetCommentIdsResponse getApiIds(ApiGetApiIdsRequest)
 
 
 
@@ -227,7 +227,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiIds(textSearch, byIPFromComment, filters, searchFilters, afterId, demo, tenantId, sso);
+    final result = api_instance.getApiIds(ApiGetApiIdsRequest(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiIds: $e\n');
@@ -263,7 +263,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getBanUsersFromComment**
-> GetBannedUsersFromCommentResponse getBanUsersFromComment(commentId, tenantId, sso)
+> GetBannedUsersFromCommentResponse getBanUsersFromComment(ApiGetBanUsersFromCommentRequest)
 
 
 
@@ -277,7 +277,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getBanUsersFromComment(commentId, tenantId, sso);
+    final result = api_instance.getBanUsersFromComment(ApiGetBanUsersFromCommentRequest(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getBanUsersFromComment: $e\n');
@@ -308,7 +308,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentBanStatus**
-> GetCommentBanStatusResponse getCommentBanStatus(commentId, tenantId, sso)
+> GetCommentBanStatusResponse getCommentBanStatus(ApiGetCommentBanStatusRequest)
 
 
 
@@ -322,7 +322,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentBanStatus(commentId, tenantId, sso);
+    final result = api_instance.getCommentBanStatus(ApiGetCommentBanStatusRequest(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentBanStatus: $e\n');
@@ -353,7 +353,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentChildren**
-> ModerationAPIChildCommentsResponse getCommentChildren(commentId, tenantId, sso)
+> ModerationAPIChildCommentsResponse getCommentChildren(ApiGetCommentChildrenRequest)
 
 
 
@@ -367,7 +367,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentChildren(commentId, tenantId, sso);
+    final result = api_instance.getCommentChildren(ApiGetCommentChildrenRequest(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentChildren: $e\n');
@@ -398,7 +398,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCount**
-> ModerationAPICountCommentsResponse getCount(textSearch, byIPFromComment, filter, searchFilters, demo, tenantId, sso)
+> ModerationAPICountCommentsResponse getCount(ApiGetCountRequest)
 
 
 
@@ -416,7 +416,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCount(textSearch, byIPFromComment, filter, searchFilters, demo, tenantId, sso);
+    final result = api_instance.getCount(ApiGetCountRequest(textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCount: $e\n');
@@ -451,7 +451,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCounts**
-> GetBannedUsersCountResponse getCounts(tenantId, sso)
+> GetBannedUsersCountResponse getCounts(ApiGetCountsRequest)
 
 
 
@@ -464,7 +464,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCounts(tenantId, sso);
+    final result = api_instance.getCounts(ApiGetCountsRequest(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCounts: $e\n');
@@ -494,7 +494,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getLogs**
-> ModerationAPIGetLogsResponse getLogs(commentId, tenantId, sso)
+> ModerationAPIGetLogsResponse getLogs(ApiGetLogsRequest)
 
 
 
@@ -508,7 +508,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getLogs(commentId, tenantId, sso);
+    final result = api_instance.getLogs(ApiGetLogsRequest(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getLogs: $e\n');
@@ -539,7 +539,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadges**
-> GetTenantManualBadgesResponse getManualBadges(tenantId, sso)
+> GetTenantManualBadgesResponse getManualBadges(ApiGetManualBadgesRequest)
 
 
 
@@ -552,7 +552,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadges(tenantId, sso);
+    final result = api_instance.getManualBadges(ApiGetManualBadgesRequest(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadges: $e\n');
@@ -582,7 +582,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadgesForUser**
-> GetUserManualBadgesResponse getManualBadgesForUser(badgesUserId, commentId, tenantId, sso)
+> GetUserManualBadgesResponse getManualBadgesForUser(ApiGetManualBadgesForUserRequest)
 
 
 
@@ -597,7 +597,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadgesForUser(badgesUserId, commentId, tenantId, sso);
+    final result = api_instance.getManualBadgesForUser(ApiGetManualBadgesForUserRequest(badgesUserId: badgesUserId, commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadgesForUser: $e\n');
@@ -629,7 +629,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationComment**
-> ModerationAPICommentResponse getModerationComment(commentId, includeEmail, includeIP, tenantId, sso)
+> ModerationAPICommentResponse getModerationComment(ApiGetModerationCommentRequest)
 
 
 
@@ -645,7 +645,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationComment(commentId, includeEmail, includeIP, tenantId, sso);
+    final result = api_instance.getModerationComment(ApiGetModerationCommentRequest(commentId: commentId, includeEmail: includeEmail, includeIP: includeIP, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationComment: $e\n');
@@ -678,7 +678,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationCommentText**
-> GetCommentTextResponse getModerationCommentText(commentId, tenantId, sso)
+> GetCommentTextResponse getModerationCommentText(ApiGetModerationCommentTextRequest)
 
 
 
@@ -692,7 +692,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationCommentText(commentId, tenantId, sso);
+    final result = api_instance.getModerationCommentText(ApiGetModerationCommentTextRequest(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationCommentText: $e\n');
@@ -723,7 +723,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPreBanSummary**
-> PreBanSummary getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso)
+> PreBanSummary getPreBanSummary(ApiGetPreBanSummaryRequest)
 
 
 
@@ -740,7 +740,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso);
+    final result = api_instance.getPreBanSummary(ApiGetPreBanSummaryRequest(commentId: commentId, includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getPreBanSummary: $e\n');
@@ -774,7 +774,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchCommentsSummary**
-> ModerationCommentSearchResponse getSearchCommentsSummary(value, filters, searchFilters, tenantId, sso)
+> ModerationCommentSearchResponse getSearchCommentsSummary(ApiGetSearchCommentsSummaryRequest)
 
 
 
@@ -790,7 +790,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchCommentsSummary(value, filters, searchFilters, tenantId, sso);
+    final result = api_instance.getSearchCommentsSummary(ApiGetSearchCommentsSummaryRequest(value: value, filters: filters, searchFilters: searchFilters, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchCommentsSummary: $e\n');
@@ -823,7 +823,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchPages**
-> ModerationPageSearchResponse getSearchPages(value, tenantId, sso)
+> ModerationPageSearchResponse getSearchPages(ApiGetSearchPagesRequest)
 
 
 
@@ -837,7 +837,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchPages(value, tenantId, sso);
+    final result = api_instance.getSearchPages(ApiGetSearchPagesRequest(value: value, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchPages: $e\n');
@@ -868,7 +868,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSites**
-> ModerationSiteSearchResponse getSearchSites(value, tenantId, sso)
+> ModerationSiteSearchResponse getSearchSites(ApiGetSearchSitesRequest)
 
 
 
@@ -882,7 +882,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSites(value, tenantId, sso);
+    final result = api_instance.getSearchSites(ApiGetSearchSitesRequest(value: value, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSites: $e\n');
@@ -913,7 +913,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSuggest**
-> ModerationSuggestResponse getSearchSuggest(textSearch, tenantId, sso)
+> ModerationSuggestResponse getSearchSuggest(ApiGetSearchSuggestRequest)
 
 
 
@@ -927,7 +927,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSuggest(textSearch, tenantId, sso);
+    final result = api_instance.getSearchSuggest(ApiGetSearchSuggestRequest(textSearch: textSearch, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSuggest: $e\n');
@@ -958,7 +958,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchUsers**
-> ModerationUserSearchResponse getSearchUsers(value, tenantId, sso)
+> ModerationUserSearchResponse getSearchUsers(ApiGetSearchUsersRequest)
 
 
 
@@ -972,7 +972,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchUsers(value, tenantId, sso);
+    final result = api_instance.getSearchUsers(ApiGetSearchUsersRequest(value: value, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchUsers: $e\n');
@@ -1003,7 +1003,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTrustFactor**
-> GetUserTrustFactorResponse getTrustFactor(userId, tenantId, sso)
+> GetUserTrustFactorResponse getTrustFactor(ApiGetTrustFactorRequest)
 
 
 
@@ -1017,7 +1017,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getTrustFactor(userId, tenantId, sso);
+    final result = api_instance.getTrustFactor(ApiGetTrustFactorRequest(userId: userId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getTrustFactor: $e\n');
@@ -1048,7 +1048,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBanPreference**
-> APIModerateGetUserBanPreferencesResponse getUserBanPreference(tenantId, sso)
+> APIModerateGetUserBanPreferencesResponse getUserBanPreference(ApiGetUserBanPreferenceRequest)
 
 
 
@@ -1061,7 +1061,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserBanPreference(tenantId, sso);
+    final result = api_instance.getUserBanPreference(ApiGetUserBanPreferenceRequest(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserBanPreference: $e\n');
@@ -1091,7 +1091,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserInternalProfile**
-> GetUserInternalProfileResponse getUserInternalProfile(commentId, tenantId, sso)
+> GetUserInternalProfileResponse getUserInternalProfile(ApiGetUserInternalProfileRequest)
 
 
 
@@ -1105,7 +1105,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserInternalProfile(commentId, tenantId, sso);
+    final result = api_instance.getUserInternalProfile(ApiGetUserInternalProfileRequest(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserInternalProfile: $e\n');
@@ -1136,7 +1136,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postAdjustCommentVotes**
-> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, tenantId, broadcastId, sso)
+> AdjustVotesResponse postAdjustCommentVotes(ApiPostAdjustCommentVotesRequest)
 
 
 
@@ -1152,7 +1152,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, tenantId, broadcastId, sso);
+    final result = api_instance.postAdjustCommentVotes(ApiPostAdjustCommentVotesRequest(commentId: commentId, adjustCommentVotesParams: adjustCommentVotesParams, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postAdjustCommentVotes: $e\n');
@@ -1185,7 +1185,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postApiExport**
-> ModerationExportResponse postApiExport(textSearch, byIPFromComment, filters, searchFilters, sorts, tenantId, sso)
+> ModerationExportResponse postApiExport(ApiPostApiExportRequest)
 
 
 
@@ -1203,7 +1203,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postApiExport(textSearch, byIPFromComment, filters, searchFilters, sorts, tenantId, sso);
+    final result = api_instance.postApiExport(ApiPostApiExportRequest(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postApiExport: $e\n');
@@ -1238,7 +1238,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserFromComment**
-> BanUserFromCommentResult postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, tenantId, sso)
+> BanUserFromCommentResult postBanUserFromComment(ApiPostBanUserFromCommentRequest)
 
 
 
@@ -1260,7 +1260,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, tenantId, sso);
+    final result = api_instance.postBanUserFromComment(ApiPostBanUserFromCommentRequest(commentId: commentId, banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserFromComment: $e\n');
@@ -1299,7 +1299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserUndo**
-> APIEmptyResponse postBanUserUndo(banUserUndoParams, tenantId, sso)
+> APIEmptyResponse postBanUserUndo(ApiPostBanUserUndoRequest)
 
 
 
@@ -1313,7 +1313,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserUndo(banUserUndoParams, tenantId, sso);
+    final result = api_instance.postBanUserUndo(ApiPostBanUserUndoRequest(banUserUndoParams: banUserUndoParams, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserUndo: $e\n');
@@ -1344,7 +1344,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBulkPreBanSummary**
-> BulkPreBanSummary postBulkPreBanSummary(bulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso)
+> BulkPreBanSummary postBulkPreBanSummary(ApiPostBulkPreBanSummaryRequest)
 
 
 
@@ -1361,7 +1361,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBulkPreBanSummary(bulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso);
+    final result = api_instance.postBulkPreBanSummary(ApiPostBulkPreBanSummaryRequest(bulkPreBanParams: bulkPreBanParams, includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBulkPreBanSummary: $e\n');
@@ -1395,7 +1395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postCommentsByIds**
-> ModerationAPIChildCommentsResponse postCommentsByIds(commentsByIdsParams, tenantId, sso)
+> ModerationAPIChildCommentsResponse postCommentsByIds(ApiPostCommentsByIdsRequest)
 
 
 
@@ -1409,7 +1409,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postCommentsByIds(commentsByIdsParams, tenantId, sso);
+    final result = api_instance.postCommentsByIds(ApiPostCommentsByIdsRequest(commentsByIdsParams: commentsByIdsParams, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postCommentsByIds: $e\n');
@@ -1440,7 +1440,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postFlagComment**
-> APIEmptyResponse postFlagComment(commentId, tenantId, broadcastId, sso)
+> APIEmptyResponse postFlagComment(ApiPostFlagCommentRequest)
 
 
 
@@ -1455,7 +1455,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postFlagComment(commentId, tenantId, broadcastId, sso);
+    final result = api_instance.postFlagComment(ApiPostFlagCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postFlagComment: $e\n');
@@ -1487,7 +1487,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRemoveComment**
-> PostRemoveCommentResponse postRemoveComment(commentId, tenantId, broadcastId, sso)
+> PostRemoveCommentResponse postRemoveComment(ApiPostRemoveCommentRequest)
 
 
 
@@ -1502,7 +1502,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRemoveComment(commentId, tenantId, broadcastId, sso);
+    final result = api_instance.postRemoveComment(ApiPostRemoveCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRemoveComment: $e\n');
@@ -1534,7 +1534,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRestoreDeletedComment**
-> APIEmptyResponse postRestoreDeletedComment(commentId, tenantId, broadcastId, sso)
+> APIEmptyResponse postRestoreDeletedComment(ApiPostRestoreDeletedCommentRequest)
 
 
 
@@ -1549,7 +1549,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRestoreDeletedComment(commentId, tenantId, broadcastId, sso);
+    final result = api_instance.postRestoreDeletedComment(ApiPostRestoreDeletedCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRestoreDeletedComment: $e\n');
@@ -1581,7 +1581,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentApprovalStatus**
-> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, approved, tenantId, broadcastId, sso)
+> SetCommentApprovedResponse postSetCommentApprovalStatus(ApiPostSetCommentApprovalStatusRequest)
 
 
 
@@ -1597,7 +1597,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentApprovalStatus(commentId, approved, tenantId, broadcastId, sso);
+    final result = api_instance.postSetCommentApprovalStatus(ApiPostSetCommentApprovalStatusRequest(commentId: commentId, approved: approved, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentApprovalStatus: $e\n');
@@ -1630,7 +1630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentReviewStatus**
-> APIEmptyResponse postSetCommentReviewStatus(commentId, reviewed, tenantId, broadcastId, sso)
+> APIEmptyResponse postSetCommentReviewStatus(ApiPostSetCommentReviewStatusRequest)
 
 
 
@@ -1646,7 +1646,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentReviewStatus(commentId, reviewed, tenantId, broadcastId, sso);
+    final result = api_instance.postSetCommentReviewStatus(ApiPostSetCommentReviewStatusRequest(commentId: commentId, reviewed: reviewed, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentReviewStatus: $e\n');
@@ -1679,7 +1679,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentSpamStatus**
-> APIEmptyResponse postSetCommentSpamStatus(commentId, spam, permNotSpam, tenantId, broadcastId, sso)
+> APIEmptyResponse postSetCommentSpamStatus(ApiPostSetCommentSpamStatusRequest)
 
 
 
@@ -1696,7 +1696,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentSpamStatus(commentId, spam, permNotSpam, tenantId, broadcastId, sso);
+    final result = api_instance.postSetCommentSpamStatus(ApiPostSetCommentSpamStatusRequest(commentId: commentId, spam: spam, permNotSpam: permNotSpam, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentSpamStatus: $e\n');
@@ -1730,7 +1730,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentText**
-> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, tenantId, broadcastId, sso)
+> SetCommentTextResponse postSetCommentText(ApiPostSetCommentTextRequest)
 
 
 
@@ -1746,7 +1746,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, tenantId, broadcastId, sso);
+    final result = api_instance.postSetCommentText(ApiPostSetCommentTextRequest(commentId: commentId, setCommentTextParams: setCommentTextParams, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentText: $e\n');
@@ -1779,7 +1779,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postUnFlagComment**
-> APIEmptyResponse postUnFlagComment(commentId, tenantId, broadcastId, sso)
+> APIEmptyResponse postUnFlagComment(ApiPostUnFlagCommentRequest)
 
 
 
@@ -1794,7 +1794,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postUnFlagComment(commentId, tenantId, broadcastId, sso);
+    final result = api_instance.postUnFlagComment(ApiPostUnFlagCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postUnFlagComment: $e\n');
@@ -1826,7 +1826,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postVote**
-> VoteResponse postVote(commentId, direction, tenantId, broadcastId, sso)
+> VoteResponse postVote(ApiPostVoteRequest)
 
 
 
@@ -1842,7 +1842,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postVote(commentId, direction, tenantId, broadcastId, sso);
+    final result = api_instance.postVote(ApiPostVoteRequest(commentId: commentId, direction: direction, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postVote: $e\n');
@@ -1875,7 +1875,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putAwardBadge**
-> AwardUserBadgeResponse putAwardBadge(badgeId, userId, commentId, tenantId, broadcastId, sso)
+> AwardUserBadgeResponse putAwardBadge(ApiPutAwardBadgeRequest)
 
 
 
@@ -1892,7 +1892,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putAwardBadge(badgeId, userId, commentId, tenantId, broadcastId, sso);
+    final result = api_instance.putAwardBadge(ApiPutAwardBadgeRequest(badgeId: badgeId, userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putAwardBadge: $e\n');
@@ -1926,7 +1926,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putCloseThread**
-> APIEmptyResponse putCloseThread(urlId, tenantId, sso)
+> APIEmptyResponse putCloseThread(ApiPutCloseThreadRequest)
 
 
 
@@ -1940,7 +1940,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putCloseThread(urlId, tenantId, sso);
+    final result = api_instance.putCloseThread(ApiPutCloseThreadRequest(urlId: urlId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putCloseThread: $e\n');
@@ -1971,7 +1971,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putRemoveBadge**
-> RemoveUserBadgeResponse putRemoveBadge(badgeId, userId, commentId, tenantId, broadcastId, sso)
+> RemoveUserBadgeResponse putRemoveBadge(ApiPutRemoveBadgeRequest)
 
 
 
@@ -1988,7 +1988,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putRemoveBadge(badgeId, userId, commentId, tenantId, broadcastId, sso);
+    final result = api_instance.putRemoveBadge(ApiPutRemoveBadgeRequest(badgeId: badgeId, userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putRemoveBadge: $e\n');
@@ -2022,7 +2022,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putReopenThread**
-> APIEmptyResponse putReopenThread(urlId, tenantId, sso)
+> APIEmptyResponse putReopenThread(ApiPutReopenThreadRequest)
 
 
 
@@ -2036,7 +2036,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putReopenThread(urlId, tenantId, sso);
+    final result = api_instance.putReopenThread(ApiPutReopenThreadRequest(urlId: urlId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putReopenThread: $e\n');
@@ -2067,7 +2067,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setTrustFactor**
-> SetUserTrustFactorResponse setTrustFactor(userId, trustFactor, tenantId, sso)
+> SetUserTrustFactorResponse setTrustFactor(ApiSetTrustFactorRequest)
 
 
 
@@ -2082,7 +2082,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setTrustFactor(userId, trustFactor, tenantId, sso);
+    final result = api_instance.setTrustFactor(ApiSetTrustFactorRequest(userId: userId, trustFactor: trustFactor, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->setTrustFactor: $e\n');
diff --git a/client/doc/PublicApi.md b/client/doc/PublicApi.md
index 47ee71d..2507a80 100644
--- a/client/doc/PublicApi.md
+++ b/client/doc/PublicApi.md
@@ -64,7 +64,7 @@ Method | HTTP request | Description
 
 
 # **blockFromCommentPublic**
-> BlockSuccess blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso)
+> BlockSuccess blockFromCommentPublic(ApiBlockFromCommentPublicRequest)
 
 
 
@@ -79,7 +79,7 @@ final publicBlockFromCommentParams = PublicBlockFromCommentParams(); // PublicBl
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso);
+    final result = api_instance.blockFromCommentPublic(ApiBlockFromCommentPublicRequest(tenantId: tenantId, commentId: commentId, publicBlockFromCommentParams: publicBlockFromCommentParams, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->blockFromCommentPublic: $e\n');
@@ -111,7 +111,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **checkedCommentsForBlocked**
-> CheckBlockedCommentsResponse checkedCommentsForBlocked(tenantId, commentIds, sso)
+> CheckBlockedCommentsResponse checkedCommentsForBlocked(ApiCheckedCommentsForBlockedRequest)
 
 
 
@@ -125,7 +125,7 @@ final commentIds = commentIds_example; // String | A comma separated list of com
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.checkedCommentsForBlocked(tenantId, commentIds, sso);
+    final result = api_instance.checkedCommentsForBlocked(ApiCheckedCommentsForBlockedRequest(tenantId: tenantId, commentIds: commentIds, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->checkedCommentsForBlocked: $e\n');
@@ -156,7 +156,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createCommentPublic**
-> SaveCommentsResponseWithPresence createCommentPublic(tenantId, urlId, broadcastId, commentData, sessionId, sso)
+> SaveCommentsResponseWithPresence createCommentPublic(ApiCreateCommentPublicRequest)
 
 
 
@@ -173,7 +173,7 @@ final sessionId = sessionId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.createCommentPublic(tenantId, urlId, broadcastId, commentData, sessionId, sso);
+    final result = api_instance.createCommentPublic(ApiCreateCommentPublicRequest(tenantId: tenantId, urlId: urlId, broadcastId: broadcastId, commentData: commentData, sessionId: sessionId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createCommentPublic: $e\n');
@@ -207,7 +207,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createFeedPostPublic**
-> CreateFeedPostResponse createFeedPostPublic(tenantId, createFeedPostParams, broadcastId, sso)
+> CreateFeedPostResponse createFeedPostPublic(ApiCreateFeedPostPublicRequest)
 
 
 
@@ -222,7 +222,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.createFeedPostPublic(tenantId, createFeedPostParams, broadcastId, sso);
+    final result = api_instance.createFeedPostPublic(ApiCreateFeedPostPublicRequest(tenantId: tenantId, createFeedPostParams: createFeedPostParams, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createFeedPostPublic: $e\n');
@@ -254,7 +254,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createV1PageReact**
-> CreateV1PageReact createV1PageReact(tenantId, urlId, title)
+> CreateV1PageReact createV1PageReact(ApiCreateV1PageReactRequest)
 
 
 
@@ -268,7 +268,7 @@ final urlId = urlId_example; // String |
 final title = title_example; // String | 
 
 try {
-    final result = api_instance.createV1PageReact(tenantId, urlId, title);
+    final result = api_instance.createV1PageReact(ApiCreateV1PageReactRequest(tenantId: tenantId, urlId: urlId, title: title));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createV1PageReact: $e\n');
@@ -299,7 +299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createV2PageReact**
-> CreateV1PageReact createV2PageReact(tenantId, urlId, id, title)
+> CreateV1PageReact createV2PageReact(ApiCreateV2PageReactRequest)
 
 
 
@@ -314,7 +314,7 @@ final id = id_example; // String |
 final title = title_example; // String | 
 
 try {
-    final result = api_instance.createV2PageReact(tenantId, urlId, id, title);
+    final result = api_instance.createV2PageReact(ApiCreateV2PageReactRequest(tenantId: tenantId, urlId: urlId, id: id, title: title));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createV2PageReact: $e\n');
@@ -346,7 +346,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteCommentPublic**
-> PublicAPIDeleteCommentResponse deleteCommentPublic(tenantId, commentId, broadcastId, editKey, sso)
+> PublicAPIDeleteCommentResponse deleteCommentPublic(ApiDeleteCommentPublicRequest)
 
 
 
@@ -362,7 +362,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteCommentPublic(tenantId, commentId, broadcastId, editKey, sso);
+    final result = api_instance.deleteCommentPublic(ApiDeleteCommentPublicRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteCommentPublic: $e\n');
@@ -395,7 +395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteCommentVote**
-> VoteDeleteResponse deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, editKey, sso)
+> VoteDeleteResponse deleteCommentVote(ApiDeleteCommentVoteRequest)
 
 
 
@@ -413,7 +413,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, editKey, sso);
+    final result = api_instance.deleteCommentVote(ApiDeleteCommentVoteRequest(tenantId: tenantId, commentId: commentId, voteId: voteId, urlId: urlId, broadcastId: broadcastId, editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteCommentVote: $e\n');
@@ -448,7 +448,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteFeedPostPublic**
-> DeleteFeedPostPublicResponse deleteFeedPostPublic(tenantId, postId, broadcastId, sso)
+> DeleteFeedPostPublicResponse deleteFeedPostPublic(ApiDeleteFeedPostPublicRequest)
 
 
 
@@ -463,7 +463,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteFeedPostPublic(tenantId, postId, broadcastId, sso);
+    final result = api_instance.deleteFeedPostPublic(ApiDeleteFeedPostPublicRequest(tenantId: tenantId, postId: postId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteFeedPostPublic: $e\n');
@@ -495,7 +495,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteV1PageReact**
-> CreateV1PageReact deleteV1PageReact(tenantId, urlId)
+> CreateV1PageReact deleteV1PageReact(ApiDeleteV1PageReactRequest)
 
 
 
@@ -508,7 +508,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.deleteV1PageReact(tenantId, urlId);
+    final result = api_instance.deleteV1PageReact(ApiDeleteV1PageReactRequest(tenantId: tenantId, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteV1PageReact: $e\n');
@@ -538,7 +538,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteV2PageReact**
-> CreateV1PageReact deleteV2PageReact(tenantId, urlId, id)
+> CreateV1PageReact deleteV2PageReact(ApiDeleteV2PageReactRequest)
 
 
 
@@ -552,7 +552,7 @@ final urlId = urlId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteV2PageReact(tenantId, urlId, id);
+    final result = api_instance.deleteV2PageReact(ApiDeleteV2PageReactRequest(tenantId: tenantId, urlId: urlId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteV2PageReact: $e\n');
@@ -583,7 +583,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **flagCommentPublic**
-> APIEmptyResponse flagCommentPublic(tenantId, commentId, isFlagged, sso)
+> APIEmptyResponse flagCommentPublic(ApiFlagCommentPublicRequest)
 
 
 
@@ -598,7 +598,7 @@ final isFlagged = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.flagCommentPublic(tenantId, commentId, isFlagged, sso);
+    final result = api_instance.flagCommentPublic(ApiFlagCommentPublicRequest(tenantId: tenantId, commentId: commentId, isFlagged: isFlagged, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->flagCommentPublic: $e\n');
@@ -630,7 +630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentText**
-> PublicAPIGetCommentTextResponse getCommentText(tenantId, commentId, editKey, sso)
+> PublicAPIGetCommentTextResponse getCommentText(ApiGetCommentTextRequest)
 
 
 
@@ -645,7 +645,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentText(tenantId, commentId, editKey, sso);
+    final result = api_instance.getCommentText(ApiGetCommentTextRequest(tenantId: tenantId, commentId: commentId, editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentText: $e\n');
@@ -677,7 +677,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentVoteUserNames**
-> GetCommentVoteUserNamesSuccessResponse getCommentVoteUserNames(tenantId, commentId, dir, sso)
+> GetCommentVoteUserNamesSuccessResponse getCommentVoteUserNames(ApiGetCommentVoteUserNamesRequest)
 
 
 
@@ -692,7 +692,7 @@ final dir = 56; // int |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentVoteUserNames(tenantId, commentId, dir, sso);
+    final result = api_instance.getCommentVoteUserNames(ApiGetCommentVoteUserNamesRequest(tenantId: tenantId, commentId: commentId, dir: dir, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentVoteUserNames: $e\n');
@@ -724,7 +724,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentsForUser**
-> GetCommentsForUserResponse getCommentsForUser(userId, direction, repliesToUserId, page, includei10n, locale, isCrawler)
+> GetCommentsForUserResponse getCommentsForUser(ApiGetCommentsForUserRequest)
 
 
 
@@ -742,7 +742,7 @@ final locale = locale_example; // String |
 final isCrawler = true; // bool | 
 
 try {
-    final result = api_instance.getCommentsForUser(userId, direction, repliesToUserId, page, includei10n, locale, isCrawler);
+    final result = api_instance.getCommentsForUser(ApiGetCommentsForUserRequest(userId: userId, direction: direction, repliesToUserId: repliesToUserId, page: page, includei10n: includei10n, locale: locale, isCrawler: isCrawler));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentsForUser: $e\n');
@@ -777,7 +777,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentsPublic**
-> GetCommentsResponseWithPresencePublicComment getCommentsPublic(tenantId, urlId, page, direction, sso, skip, skipChildren, limit, limitChildren, countChildren, fetchPageForCommentId, includeConfig, countAll, includei10n, locale, modules, isCrawler, includeNotificationCount, asTree, maxTreeDepth, useFullTranslationIds, parentId, searchText, hashTags, userId, customConfigStr, afterCommentId, beforeCommentId)
+> GetCommentsResponseWithPresencePublicComment getCommentsPublic(ApiGetCommentsPublicRequest)
 
 
 
@@ -818,7 +818,7 @@ final afterCommentId = afterCommentId_example; // String |
 final beforeCommentId = beforeCommentId_example; // String | 
 
 try {
-    final result = api_instance.getCommentsPublic(tenantId, urlId, page, direction, sso, skip, skipChildren, limit, limitChildren, countChildren, fetchPageForCommentId, includeConfig, countAll, includei10n, locale, modules, isCrawler, includeNotificationCount, asTree, maxTreeDepth, useFullTranslationIds, parentId, searchText, hashTags, userId, customConfigStr, afterCommentId, beforeCommentId);
+    final result = api_instance.getCommentsPublic(ApiGetCommentsPublicRequest(tenantId: tenantId, urlId: urlId, page: page, direction: direction, sso: sso, skip: skip, skipChildren: skipChildren, limit: limit, limitChildren: limitChildren, countChildren: countChildren, fetchPageForCommentId: fetchPageForCommentId, includeConfig: includeConfig, countAll: countAll, includei10n: includei10n, locale: locale, modules: modules, isCrawler: isCrawler, includeNotificationCount: includeNotificationCount, asTree: asTree, maxTreeDepth: maxTreeDepth, useFullTranslationIds: useFullTranslationIds, parentId: parentId, searchText: searchText, hashTags: hashTags, userId: userId, customConfigStr: customConfigStr, afterCommentId: afterCommentId, beforeCommentId: beforeCommentId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentsPublic: $e\n');
@@ -874,7 +874,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEventLog**
-> GetEventLogResponse getEventLog(tenantId, urlId, userIdWS, startTime, endTime)
+> GetEventLogResponse getEventLog(ApiGetEventLogRequest)
 
 
 
@@ -892,7 +892,7 @@ final startTime = 789; // int |
 final endTime = 789; // int | 
 
 try {
-    final result = api_instance.getEventLog(tenantId, urlId, userIdWS, startTime, endTime);
+    final result = api_instance.getEventLog(ApiGetEventLogRequest(tenantId: tenantId, urlId: urlId, userIdWS: userIdWS, startTime: startTime, endTime: endTime));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getEventLog: $e\n');
@@ -925,7 +925,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPostsPublic**
-> PublicFeedPostsResponse getFeedPostsPublic(tenantId, afterId, limit, tags, sso, isCrawler, includeUserInfo)
+> PublicFeedPostsResponse getFeedPostsPublic(ApiGetFeedPostsPublicRequest)
 
 
 
@@ -945,7 +945,7 @@ final isCrawler = true; // bool |
 final includeUserInfo = true; // bool | 
 
 try {
-    final result = api_instance.getFeedPostsPublic(tenantId, afterId, limit, tags, sso, isCrawler, includeUserInfo);
+    final result = api_instance.getFeedPostsPublic(ApiGetFeedPostsPublicRequest(tenantId: tenantId, afterId: afterId, limit: limit, tags: tags, sso: sso, isCrawler: isCrawler, includeUserInfo: includeUserInfo));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getFeedPostsPublic: $e\n');
@@ -980,7 +980,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPostsStats**
-> FeedPostsStatsResponse getFeedPostsStats(tenantId, postIds, sso)
+> FeedPostsStatsResponse getFeedPostsStats(ApiGetFeedPostsStatsRequest)
 
 
 
@@ -994,7 +994,7 @@ final postIds = []; // List<String> |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getFeedPostsStats(tenantId, postIds, sso);
+    final result = api_instance.getFeedPostsStats(ApiGetFeedPostsStatsRequest(tenantId: tenantId, postIds: postIds, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getFeedPostsStats: $e\n');
@@ -1025,7 +1025,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifLarge**
-> GifGetLargeResponse getGifLarge(tenantId, largeInternalURLSanitized)
+> GifGetLargeResponse getGifLarge(ApiGetGifLargeRequest)
 
 
 
@@ -1038,7 +1038,7 @@ final tenantId = tenantId_example; // String |
 final largeInternalURLSanitized = largeInternalURLSanitized_example; // String | 
 
 try {
-    final result = api_instance.getGifLarge(tenantId, largeInternalURLSanitized);
+    final result = api_instance.getGifLarge(ApiGetGifLargeRequest(tenantId: tenantId, largeInternalURLSanitized: largeInternalURLSanitized));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifLarge: $e\n');
@@ -1068,7 +1068,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifsSearch**
-> GetGifsSearchResponse getGifsSearch(tenantId, search, locale, rating, page)
+> GetGifsSearchResponse getGifsSearch(ApiGetGifsSearchRequest)
 
 
 
@@ -1084,7 +1084,7 @@ final rating = rating_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getGifsSearch(tenantId, search, locale, rating, page);
+    final result = api_instance.getGifsSearch(ApiGetGifsSearchRequest(tenantId: tenantId, search: search, locale: locale, rating: rating, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifsSearch: $e\n');
@@ -1117,7 +1117,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifsTrending**
-> GetGifsTrendingResponse getGifsTrending(tenantId, locale, rating, page)
+> GetGifsTrendingResponse getGifsTrending(ApiGetGifsTrendingRequest)
 
 
 
@@ -1132,7 +1132,7 @@ final rating = rating_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getGifsTrending(tenantId, locale, rating, page);
+    final result = api_instance.getGifsTrending(ApiGetGifsTrendingRequest(tenantId: tenantId, locale: locale, rating: rating, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifsTrending: $e\n');
@@ -1164,7 +1164,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGlobalEventLog**
-> GetEventLogResponse getGlobalEventLog(tenantId, urlId, userIdWS, startTime, endTime)
+> GetEventLogResponse getGlobalEventLog(ApiGetGlobalEventLogRequest)
 
 
 
@@ -1182,7 +1182,7 @@ final startTime = 789; // int |
 final endTime = 789; // int | 
 
 try {
-    final result = api_instance.getGlobalEventLog(tenantId, urlId, userIdWS, startTime, endTime);
+    final result = api_instance.getGlobalEventLog(ApiGetGlobalEventLogRequest(tenantId: tenantId, urlId: urlId, userIdWS: userIdWS, startTime: startTime, endTime: endTime));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGlobalEventLog: $e\n');
@@ -1215,7 +1215,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getOfflineUsers**
-> PageUsersOfflineResponse getOfflineUsers(tenantId, urlId, afterName, afterUserId)
+> PageUsersOfflineResponse getOfflineUsers(ApiGetOfflineUsersRequest)
 
 
 
@@ -1232,7 +1232,7 @@ final afterName = afterName_example; // String | Cursor: pass nextAfterName from
 final afterUserId = afterUserId_example; // String | Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
 
 try {
-    final result = api_instance.getOfflineUsers(tenantId, urlId, afterName, afterUserId);
+    final result = api_instance.getOfflineUsers(ApiGetOfflineUsersRequest(tenantId: tenantId, urlId: urlId, afterName: afterName, afterUserId: afterUserId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getOfflineUsers: $e\n');
@@ -1264,7 +1264,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getOnlineUsers**
-> PageUsersOnlineResponse getOnlineUsers(tenantId, urlId, afterName, afterUserId)
+> PageUsersOnlineResponse getOnlineUsers(ApiGetOnlineUsersRequest)
 
 
 
@@ -1281,7 +1281,7 @@ final afterName = afterName_example; // String | Cursor: pass nextAfterName from
 final afterUserId = afterUserId_example; // String | Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
 
 try {
-    final result = api_instance.getOnlineUsers(tenantId, urlId, afterName, afterUserId);
+    final result = api_instance.getOnlineUsers(ApiGetOnlineUsersRequest(tenantId: tenantId, urlId: urlId, afterName: afterName, afterUserId: afterUserId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getOnlineUsers: $e\n');
@@ -1313,7 +1313,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPagesPublic**
-> GetPublicPagesResponse getPagesPublic(tenantId, cursor, limit, q, sortBy, hasComments)
+> GetPublicPagesResponse getPagesPublic(ApiGetPagesPublicRequest)
 
 
 
@@ -1332,7 +1332,7 @@ final sortBy = ; // PagesSortBy | Sort order. `updatedAt` (default, newest first
 final hasComments = true; // bool | If true, only return pages with at least one comment.
 
 try {
-    final result = api_instance.getPagesPublic(tenantId, cursor, limit, q, sortBy, hasComments);
+    final result = api_instance.getPagesPublic(ApiGetPagesPublicRequest(tenantId: tenantId, cursor: cursor, limit: limit, q: q, sortBy: sortBy, hasComments: hasComments));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getPagesPublic: $e\n');
@@ -1366,7 +1366,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTranslations**
-> GetTranslationsResponse getTranslations(namespace, component, locale, useFullTranslationIds)
+> GetTranslationsResponse getTranslations(ApiGetTranslationsRequest)
 
 
 
@@ -1381,7 +1381,7 @@ final locale = locale_example; // String |
 final useFullTranslationIds = true; // bool | 
 
 try {
-    final result = api_instance.getTranslations(namespace, component, locale, useFullTranslationIds);
+    final result = api_instance.getTranslations(ApiGetTranslationsRequest(namespace: namespace, component: component, locale: locale, useFullTranslationIds: useFullTranslationIds));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getTranslations: $e\n');
@@ -1413,7 +1413,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserNotificationCount**
-> GetUserNotificationCountResponse getUserNotificationCount(tenantId, sso)
+> GetUserNotificationCountResponse getUserNotificationCount(ApiGetUserNotificationCountRequest)
 
 
 
@@ -1426,7 +1426,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserNotificationCount(tenantId, sso);
+    final result = api_instance.getUserNotificationCount(ApiGetUserNotificationCountRequest(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserNotificationCount: $e\n');
@@ -1456,7 +1456,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserNotifications**
-> GetMyNotificationsResponse getUserNotifications(tenantId, urlId, pageSize, afterId, includeContext, afterCreatedAt, unreadOnly, dmOnly, noDm, includeTranslations, includeTenantNotifications, sso)
+> GetMyNotificationsResponse getUserNotifications(ApiGetUserNotificationsRequest)
 
 
 
@@ -1479,7 +1479,7 @@ final includeTenantNotifications = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserNotifications(tenantId, urlId, pageSize, afterId, includeContext, afterCreatedAt, unreadOnly, dmOnly, noDm, includeTranslations, includeTenantNotifications, sso);
+    final result = api_instance.getUserNotifications(ApiGetUserNotificationsRequest(tenantId: tenantId, urlId: urlId, pageSize: pageSize, afterId: afterId, includeContext: includeContext, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, includeTranslations: includeTranslations, includeTenantNotifications: includeTenantNotifications, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserNotifications: $e\n');
@@ -1519,7 +1519,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserPresenceStatuses**
-> GetUserPresenceStatusesResponse getUserPresenceStatuses(tenantId, urlIdWS, userIds)
+> GetUserPresenceStatusesResponse getUserPresenceStatuses(ApiGetUserPresenceStatusesRequest)
 
 
 
@@ -1533,7 +1533,7 @@ final urlIdWS = urlIdWS_example; // String |
 final userIds = userIds_example; // String | 
 
 try {
-    final result = api_instance.getUserPresenceStatuses(tenantId, urlIdWS, userIds);
+    final result = api_instance.getUserPresenceStatuses(ApiGetUserPresenceStatusesRequest(tenantId: tenantId, urlIdWS: urlIdWS, userIds: userIds));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserPresenceStatuses: $e\n');
@@ -1564,7 +1564,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserReactsPublic**
-> UserReactsResponse getUserReactsPublic(tenantId, postIds, sso)
+> UserReactsResponse getUserReactsPublic(ApiGetUserReactsPublicRequest)
 
 
 
@@ -1578,7 +1578,7 @@ final postIds = []; // List<String> |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserReactsPublic(tenantId, postIds, sso);
+    final result = api_instance.getUserReactsPublic(ApiGetUserReactsPublicRequest(tenantId: tenantId, postIds: postIds, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserReactsPublic: $e\n');
@@ -1609,7 +1609,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUsersInfo**
-> PageUsersInfoResponse getUsersInfo(tenantId, ids)
+> PageUsersInfoResponse getUsersInfo(ApiGetUsersInfoRequest)
 
 
 
@@ -1624,7 +1624,7 @@ final tenantId = tenantId_example; // String |
 final ids = ids_example; // String | Comma-delimited userIds.
 
 try {
-    final result = api_instance.getUsersInfo(tenantId, ids);
+    final result = api_instance.getUsersInfo(ApiGetUsersInfoRequest(tenantId: tenantId, ids: ids));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUsersInfo: $e\n');
@@ -1654,7 +1654,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV1PageLikes**
-> GetV1PageLikes getV1PageLikes(tenantId, urlId)
+> GetV1PageLikes getV1PageLikes(ApiGetV1PageLikesRequest)
 
 
 
@@ -1667,7 +1667,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getV1PageLikes(tenantId, urlId);
+    final result = api_instance.getV1PageLikes(ApiGetV1PageLikesRequest(tenantId: tenantId, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV1PageLikes: $e\n');
@@ -1697,7 +1697,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV2PageReactUsers**
-> GetV2PageReactUsersResponse getV2PageReactUsers(tenantId, urlId, id)
+> GetV2PageReactUsersResponse getV2PageReactUsers(ApiGetV2PageReactUsersRequest)
 
 
 
@@ -1711,7 +1711,7 @@ final urlId = urlId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getV2PageReactUsers(tenantId, urlId, id);
+    final result = api_instance.getV2PageReactUsers(ApiGetV2PageReactUsersRequest(tenantId: tenantId, urlId: urlId, id: id));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV2PageReactUsers: $e\n');
@@ -1742,7 +1742,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV2PageReacts**
-> GetV2PageReacts getV2PageReacts(tenantId, urlId)
+> GetV2PageReacts getV2PageReacts(ApiGetV2PageReactsRequest)
 
 
 
@@ -1755,7 +1755,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getV2PageReacts(tenantId, urlId);
+    final result = api_instance.getV2PageReacts(ApiGetV2PageReactsRequest(tenantId: tenantId, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV2PageReacts: $e\n');
@@ -1785,7 +1785,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **lockComment**
-> APIEmptyResponse lockComment(tenantId, commentId, broadcastId, sso)
+> APIEmptyResponse lockComment(ApiLockCommentRequest)
 
 
 
@@ -1800,7 +1800,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.lockComment(tenantId, commentId, broadcastId, sso);
+    final result = api_instance.lockComment(ApiLockCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->lockComment: $e\n');
@@ -1832,7 +1832,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **logoutPublic**
-> APIEmptyResponse logoutPublic()
+> APIEmptyResponse logoutPublic(ApiLogoutPublicRequest)
 
 
 
@@ -1843,7 +1843,7 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = PublicApi();
 
 try {
-    final result = api_instance.logoutPublic();
+    final result = api_instance.logoutPublic(ApiLogoutPublicRequest());
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->logoutPublic: $e\n');
@@ -1869,7 +1869,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **pinComment**
-> ChangeCommentPinStatusResponse pinComment(tenantId, commentId, broadcastId, sso)
+> ChangeCommentPinStatusResponse pinComment(ApiPinCommentRequest)
 
 
 
@@ -1884,7 +1884,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.pinComment(tenantId, commentId, broadcastId, sso);
+    final result = api_instance.pinComment(ApiPinCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->pinComment: $e\n');
@@ -1916,7 +1916,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **reactFeedPostPublic**
-> ReactFeedPostResponse reactFeedPostPublic(tenantId, postId, reactBodyParams, isUndo, broadcastId, sso)
+> ReactFeedPostResponse reactFeedPostPublic(ApiReactFeedPostPublicRequest)
 
 
 
@@ -1933,7 +1933,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.reactFeedPostPublic(tenantId, postId, reactBodyParams, isUndo, broadcastId, sso);
+    final result = api_instance.reactFeedPostPublic(ApiReactFeedPostPublicRequest(tenantId: tenantId, postId: postId, reactBodyParams: reactBodyParams, isUndo: isUndo, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->reactFeedPostPublic: $e\n');
@@ -1967,7 +1967,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **resetUserNotificationCount**
-> ResetUserNotificationsResponse resetUserNotificationCount(tenantId, sso)
+> ResetUserNotificationsResponse resetUserNotificationCount(ApiResetUserNotificationCountRequest)
 
 
 
@@ -1980,7 +1980,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.resetUserNotificationCount(tenantId, sso);
+    final result = api_instance.resetUserNotificationCount(ApiResetUserNotificationCountRequest(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->resetUserNotificationCount: $e\n');
@@ -2010,7 +2010,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **resetUserNotifications**
-> ResetUserNotificationsResponse resetUserNotifications(tenantId, afterId, afterCreatedAt, unreadOnly, dmOnly, noDm, sso)
+> ResetUserNotificationsResponse resetUserNotifications(ApiResetUserNotificationsRequest)
 
 
 
@@ -2028,7 +2028,7 @@ final noDm = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.resetUserNotifications(tenantId, afterId, afterCreatedAt, unreadOnly, dmOnly, noDm, sso);
+    final result = api_instance.resetUserNotifications(ApiResetUserNotificationsRequest(tenantId: tenantId, afterId: afterId, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->resetUserNotifications: $e\n');
@@ -2063,7 +2063,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **searchUsers**
-> SearchUsersResult searchUsers(tenantId, urlId, usernameStartsWith, mentionGroupIds, sso, searchSection)
+> SearchUsersResult searchUsers(ApiSearchUsersRequest)
 
 
 
@@ -2080,7 +2080,7 @@ final sso = sso_example; // String |
 final searchSection = searchSection_example; // String | 
 
 try {
-    final result = api_instance.searchUsers(tenantId, urlId, usernameStartsWith, mentionGroupIds, sso, searchSection);
+    final result = api_instance.searchUsers(ApiSearchUsersRequest(tenantId: tenantId, urlId: urlId, usernameStartsWith: usernameStartsWith, mentionGroupIds: mentionGroupIds, sso: sso, searchSection: searchSection));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->searchUsers: $e\n');
@@ -2114,7 +2114,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setCommentText**
-> PublicAPISetCommentTextResponse setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, editKey, sso)
+> PublicAPISetCommentTextResponse setCommentText(ApiSetCommentTextRequest)
 
 
 
@@ -2131,7 +2131,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, editKey, sso);
+    final result = api_instance.setCommentText(ApiSetCommentTextRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, commentTextUpdateRequest: commentTextUpdateRequest, editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->setCommentText: $e\n');
@@ -2165,7 +2165,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unBlockCommentPublic**
-> UnblockSuccess unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso)
+> UnblockSuccess unBlockCommentPublic(ApiUnBlockCommentPublicRequest)
 
 
 
@@ -2180,7 +2180,7 @@ final publicBlockFromCommentParams = PublicBlockFromCommentParams(); // PublicBl
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso);
+    final result = api_instance.unBlockCommentPublic(ApiUnBlockCommentPublicRequest(tenantId: tenantId, commentId: commentId, publicBlockFromCommentParams: publicBlockFromCommentParams, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unBlockCommentPublic: $e\n');
@@ -2212,7 +2212,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unLockComment**
-> APIEmptyResponse unLockComment(tenantId, commentId, broadcastId, sso)
+> APIEmptyResponse unLockComment(ApiUnLockCommentRequest)
 
 
 
@@ -2227,7 +2227,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unLockComment(tenantId, commentId, broadcastId, sso);
+    final result = api_instance.unLockComment(ApiUnLockCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unLockComment: $e\n');
@@ -2259,7 +2259,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unPinComment**
-> ChangeCommentPinStatusResponse unPinComment(tenantId, commentId, broadcastId, sso)
+> ChangeCommentPinStatusResponse unPinComment(ApiUnPinCommentRequest)
 
 
 
@@ -2274,7 +2274,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unPinComment(tenantId, commentId, broadcastId, sso);
+    final result = api_instance.unPinComment(ApiUnPinCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unPinComment: $e\n');
@@ -2306,7 +2306,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateFeedPostPublic**
-> CreateFeedPostResponse updateFeedPostPublic(tenantId, postId, updateFeedPostParams, broadcastId, sso)
+> CreateFeedPostResponse updateFeedPostPublic(ApiUpdateFeedPostPublicRequest)
 
 
 
@@ -2322,7 +2322,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateFeedPostPublic(tenantId, postId, updateFeedPostParams, broadcastId, sso);
+    final result = api_instance.updateFeedPostPublic(ApiUpdateFeedPostPublicRequest(tenantId: tenantId, postId: postId, updateFeedPostParams: updateFeedPostParams, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateFeedPostPublic: $e\n');
@@ -2355,7 +2355,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationCommentSubscriptionStatus**
-> UpdateUserNotificationCommentSubscriptionStatusResponse updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, sso)
+> UpdateUserNotificationCommentSubscriptionStatusResponse updateUserNotificationCommentSubscriptionStatus(ApiUpdateUserNotificationCommentSubscriptionStatusRequest)
 
 
 
@@ -2373,7 +2373,7 @@ final commentId = commentId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, sso);
+    final result = api_instance.updateUserNotificationCommentSubscriptionStatus(ApiUpdateUserNotificationCommentSubscriptionStatusRequest(tenantId: tenantId, notificationId: notificationId, optedInOrOut: optedInOrOut, commentId: commentId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationCommentSubscriptionStatus: $e\n');
@@ -2406,7 +2406,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationPageSubscriptionStatus**
-> UpdateUserNotificationPageSubscriptionStatusResponse updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso)
+> UpdateUserNotificationPageSubscriptionStatusResponse updateUserNotificationPageSubscriptionStatus(ApiUpdateUserNotificationPageSubscriptionStatusRequest)
 
 
 
@@ -2425,7 +2425,7 @@ final subscribedOrUnsubscribed = subscribedOrUnsubscribed_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso);
+    final result = api_instance.updateUserNotificationPageSubscriptionStatus(ApiUpdateUserNotificationPageSubscriptionStatusRequest(tenantId: tenantId, urlId: urlId, url: url, pageTitle: pageTitle, subscribedOrUnsubscribed: subscribedOrUnsubscribed, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationPageSubscriptionStatus: $e\n');
@@ -2459,7 +2459,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationStatus**
-> UpdateUserNotificationStatusResponse updateUserNotificationStatus(tenantId, notificationId, newStatus, sso)
+> UpdateUserNotificationStatusResponse updateUserNotificationStatus(ApiUpdateUserNotificationStatusRequest)
 
 
 
@@ -2474,7 +2474,7 @@ final newStatus = newStatus_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationStatus(tenantId, notificationId, newStatus, sso);
+    final result = api_instance.updateUserNotificationStatus(ApiUpdateUserNotificationStatusRequest(tenantId: tenantId, notificationId: notificationId, newStatus: newStatus, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationStatus: $e\n');
@@ -2506,7 +2506,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **uploadImage**
-> UploadImageResponse uploadImage(tenantId, file, sizePreset, urlId)
+> UploadImageResponse uploadImage(ApiUploadImageRequest)
 
 
 
@@ -2523,7 +2523,7 @@ final sizePreset = ; // SizePreset | Size preset: \"Default\" (1000x1000px) or \
 final urlId = urlId_example; // String | Page id that upload is happening from, to configure
 
 try {
-    final result = api_instance.uploadImage(tenantId, file, sizePreset, urlId);
+    final result = api_instance.uploadImage(ApiUploadImageRequest(tenantId: tenantId, file: file, sizePreset: sizePreset, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->uploadImage: $e\n');
@@ -2555,7 +2555,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **voteComment**
-> VoteResponse voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, sessionId, sso)
+> VoteResponse voteComment(ApiVoteCommentRequest)
 
 
 
@@ -2573,7 +2573,7 @@ final sessionId = sessionId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, sessionId, sso);
+    final result = api_instance.voteComment(ApiVoteCommentRequest(tenantId: tenantId, commentId: commentId, urlId: urlId, broadcastId: broadcastId, voteBodyParams: voteBodyParams, sessionId: sessionId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->voteComment: $e\n');

From fae084513f4b0346dfe6ea12a4a0c7e0ba125f0b Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Tue, 23 Jun 2026 00:25:46 -0700
Subject: [PATCH 4/9] Regenerate: required params + body positional, optionals
 in one object

API methods now take required params + body positionally, with optional params in a single Api<Op>Options object. Updated SSO integration test + README.
---
 README.md                                |   11 +-
 client/doc/DefaultApi.md                 |  456 ++---
 client/doc/ModerationApi.md              |  172 +-
 client/doc/PublicApi.md                  |  208 +-
 client/lib/api/default_api.dart          | 2347 ++++++----------------
 client/lib/api/moderation_api.dart       |  927 ++++-----
 client/lib/api/public_api.dart           | 1246 ++++--------
 sso_tests/test/sso_integration_test.dart |   24 +-
 8 files changed, 1918 insertions(+), 3473 deletions(-)

diff --git a/README.md b/README.md
index 085c994..3530df6 100644
--- a/README.md
+++ b/README.md
@@ -57,19 +57,14 @@ The client exposes three API classes:
 import 'package:fastcomments_dart/api.dart';
 
 final api = PublicApi(ApiClient(basePath: 'https://fastcomments.com'));
-final comments = await api.getCommentsPublic(ApiGetCommentsPublicRequest(
-  tenantId: 'YOUR_TENANT_ID',
-  urlId: 'YOUR_URL_ID',
-));
+final comments = await api.getCommentsPublic('YOUR_TENANT_ID', 'YOUR_URL_ID');
 ```
 
 ```dart
 import 'package:fastcomments_dart/api.dart';
 
 final publicApi = PublicApi(ApiClient(basePath: 'https://fastcomments.com'));
-final feedPosts = await publicApi.getFeedPostsPublic(
-  ApiGetFeedPostsPublicRequest(tenantId: 'YOUR_TENANT_ID'),
-);
+final feedPosts = await publicApi.getFeedPostsPublic('YOUR_TENANT_ID');
 ```
 
 ```dart
@@ -77,7 +72,7 @@ import 'package:fastcomments_dart/api.dart';
 
 final moderation = ModerationApi(ApiClient(basePath: 'https://fastcomments.com'));
 final result = await moderation.getApiComments(
-  ApiGetApiCommentsRequest(sso: 'SSO_TOKEN'),
+  ApiGetApiCommentsOptions(sso: 'SSO_TOKEN'),
 );
 ```
 
diff --git a/client/doc/DefaultApi.md b/client/doc/DefaultApi.md
index 3236173..a66d445 100644
--- a/client/doc/DefaultApi.md
+++ b/client/doc/DefaultApi.md
@@ -126,7 +126,7 @@ Method | HTTP request | Description
 
 
 # **addDomainConfig**
-> AddDomainConfigResponse addDomainConfig(ApiAddDomainConfigRequest)
+> AddDomainConfigResponse addDomainConfig(tenantId, addDomainConfigParams, )
 
 
 
@@ -143,7 +143,7 @@ final tenantId = tenantId_example; // String |
 final addDomainConfigParams = AddDomainConfigParams(); // AddDomainConfigParams | 
 
 try {
-    final result = api_instance.addDomainConfig(ApiAddDomainConfigRequest(tenantId: tenantId, addDomainConfigParams: addDomainConfigParams));
+    final result = api_instance.addDomainConfig(tenantId, addDomainConfigParams, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addDomainConfig: $e\n');
@@ -173,7 +173,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTag**
-> CreateHashTagResponse addHashTag(ApiAddHashTagRequest)
+> CreateHashTagResponse addHashTag(createHashTagBody, ApiAddHashTagOptions options)
 
 
 
@@ -190,7 +190,7 @@ final tenantId = tenantId_example; // String |
 final createHashTagBody = CreateHashTagBody(); // CreateHashTagBody | 
 
 try {
-    final result = api_instance.addHashTag(ApiAddHashTagRequest(tenantId: tenantId, createHashTagBody: createHashTagBody));
+    final result = api_instance.addHashTag(createHashTagBody, ApiAddHashTagOptions(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTag: $e\n');
@@ -220,7 +220,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTagsBulk**
-> BulkCreateHashTagsResponse addHashTagsBulk(ApiAddHashTagsBulkRequest)
+> BulkCreateHashTagsResponse addHashTagsBulk(bulkCreateHashTagsBody, ApiAddHashTagsBulkOptions options)
 
 
 
@@ -237,7 +237,7 @@ final tenantId = tenantId_example; // String |
 final bulkCreateHashTagsBody = BulkCreateHashTagsBody(); // BulkCreateHashTagsBody | 
 
 try {
-    final result = api_instance.addHashTagsBulk(ApiAddHashTagsBulkRequest(tenantId: tenantId, bulkCreateHashTagsBody: bulkCreateHashTagsBody));
+    final result = api_instance.addHashTagsBulk(bulkCreateHashTagsBody, ApiAddHashTagsBulkOptions(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTagsBulk: $e\n');
@@ -267,7 +267,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addPage**
-> AddPageAPIResponse addPage(ApiAddPageRequest)
+> AddPageAPIResponse addPage(tenantId, createAPIPageData, )
 
 
 
@@ -284,7 +284,7 @@ final tenantId = tenantId_example; // String |
 final createAPIPageData = CreateAPIPageData(); // CreateAPIPageData | 
 
 try {
-    final result = api_instance.addPage(ApiAddPageRequest(tenantId: tenantId, createAPIPageData: createAPIPageData));
+    final result = api_instance.addPage(tenantId, createAPIPageData, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addPage: $e\n');
@@ -314,7 +314,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addSSOUser**
-> AddSSOUserAPIResponse addSSOUser(ApiAddSSOUserRequest)
+> AddSSOUserAPIResponse addSSOUser(tenantId, createAPISSOUserData, )
 
 
 
@@ -331,7 +331,7 @@ final tenantId = tenantId_example; // String |
 final createAPISSOUserData = CreateAPISSOUserData(); // CreateAPISSOUserData | 
 
 try {
-    final result = api_instance.addSSOUser(ApiAddSSOUserRequest(tenantId: tenantId, createAPISSOUserData: createAPISSOUserData));
+    final result = api_instance.addSSOUser(tenantId, createAPISSOUserData, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addSSOUser: $e\n');
@@ -361,7 +361,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **aggregate**
-> AggregateResponse aggregate(ApiAggregateRequest)
+> AggregateResponse aggregate(tenantId, aggregationRequest, ApiAggregateOptions options)
 
 
 
@@ -382,7 +382,7 @@ final parentTenantId = parentTenantId_example; // String |
 final includeStats = true; // bool | 
 
 try {
-    final result = api_instance.aggregate(ApiAggregateRequest(tenantId: tenantId, aggregationRequest: aggregationRequest, parentTenantId: parentTenantId, includeStats: includeStats));
+    final result = api_instance.aggregate(tenantId, aggregationRequest, ApiAggregateOptions(parentTenantId: parentTenantId, includeStats: includeStats));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->aggregate: $e\n');
@@ -414,7 +414,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **aggregateQuestionResults**
-> AggregateQuestionResultsResponse aggregateQuestionResults(ApiAggregateQuestionResultsRequest)
+> AggregateQuestionResultsResponse aggregateQuestionResults(tenantId, ApiAggregateQuestionResultsOptions options)
 
 
 
@@ -436,7 +436,7 @@ final startDate = 2013-10-20T19:20:30+01:00; // DateTime |
 final forceRecalculate = true; // bool | 
 
 try {
-    final result = api_instance.aggregateQuestionResults(ApiAggregateQuestionResultsRequest(tenantId: tenantId, questionId: questionId, questionIds: questionIds, urlId: urlId, timeBucket: timeBucket, startDate: startDate, forceRecalculate: forceRecalculate));
+    final result = api_instance.aggregateQuestionResults(tenantId, ApiAggregateQuestionResultsOptions(questionId: questionId, questionIds: questionIds, urlId: urlId, timeBucket: timeBucket, startDate: startDate, forceRecalculate: forceRecalculate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->aggregateQuestionResults: $e\n');
@@ -471,7 +471,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **blockUserFromComment**
-> BlockSuccess blockUserFromComment(ApiBlockUserFromCommentRequest)
+> BlockSuccess blockUserFromComment(tenantId, id, blockFromCommentParams, ApiBlockUserFromCommentOptions options)
 
 
 
@@ -491,7 +491,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.blockUserFromComment(ApiBlockUserFromCommentRequest(tenantId: tenantId, id: id, blockFromCommentParams: blockFromCommentParams, userId: userId, anonUserId: anonUserId));
+    final result = api_instance.blockUserFromComment(tenantId, id, blockFromCommentParams, ApiBlockUserFromCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->blockUserFromComment: $e\n');
@@ -524,7 +524,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **bulkAggregateQuestionResults**
-> BulkAggregateQuestionResultsResponse bulkAggregateQuestionResults(ApiBulkAggregateQuestionResultsRequest)
+> BulkAggregateQuestionResultsResponse bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, ApiBulkAggregateQuestionResultsOptions options)
 
 
 
@@ -542,7 +542,7 @@ final bulkAggregateQuestionResultsRequest = BulkAggregateQuestionResultsRequest(
 final forceRecalculate = true; // bool | 
 
 try {
-    final result = api_instance.bulkAggregateQuestionResults(ApiBulkAggregateQuestionResultsRequest(tenantId: tenantId, bulkAggregateQuestionResultsRequest: bulkAggregateQuestionResultsRequest, forceRecalculate: forceRecalculate));
+    final result = api_instance.bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, ApiBulkAggregateQuestionResultsOptions(forceRecalculate: forceRecalculate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->bulkAggregateQuestionResults: $e\n');
@@ -573,7 +573,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **changeTicketState**
-> ChangeTicketStateResponse changeTicketState(ApiChangeTicketStateRequest)
+> ChangeTicketStateResponse changeTicketState(tenantId, userId, id, changeTicketStateBody, )
 
 
 
@@ -592,7 +592,7 @@ final id = id_example; // String |
 final changeTicketStateBody = ChangeTicketStateBody(); // ChangeTicketStateBody | 
 
 try {
-    final result = api_instance.changeTicketState(ApiChangeTicketStateRequest(tenantId: tenantId, userId: userId, id: id, changeTicketStateBody: changeTicketStateBody));
+    final result = api_instance.changeTicketState(tenantId, userId, id, changeTicketStateBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->changeTicketState: $e\n');
@@ -624,7 +624,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **combineCommentsWithQuestionResults**
-> CombineQuestionResultsWithCommentsResponse combineCommentsWithQuestionResults(ApiCombineCommentsWithQuestionResultsRequest)
+> CombineQuestionResultsWithCommentsResponse combineCommentsWithQuestionResults(tenantId, ApiCombineCommentsWithQuestionResultsOptions options)
 
 
 
@@ -648,7 +648,7 @@ final maxValue = 1.2; // double |
 final limit = 1.2; // double | 
 
 try {
-    final result = api_instance.combineCommentsWithQuestionResults(ApiCombineCommentsWithQuestionResultsRequest(tenantId: tenantId, questionId: questionId, questionIds: questionIds, urlId: urlId, startDate: startDate, forceRecalculate: forceRecalculate, minValue: minValue, maxValue: maxValue, limit: limit));
+    final result = api_instance.combineCommentsWithQuestionResults(tenantId, ApiCombineCommentsWithQuestionResultsOptions(questionId: questionId, questionIds: questionIds, urlId: urlId, startDate: startDate, forceRecalculate: forceRecalculate, minValue: minValue, maxValue: maxValue, limit: limit));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->combineCommentsWithQuestionResults: $e\n');
@@ -685,7 +685,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createEmailTemplate**
-> CreateEmailTemplateResponse createEmailTemplate(ApiCreateEmailTemplateRequest)
+> CreateEmailTemplateResponse createEmailTemplate(tenantId, createEmailTemplateBody, )
 
 
 
@@ -702,7 +702,7 @@ final tenantId = tenantId_example; // String |
 final createEmailTemplateBody = CreateEmailTemplateBody(); // CreateEmailTemplateBody | 
 
 try {
-    final result = api_instance.createEmailTemplate(ApiCreateEmailTemplateRequest(tenantId: tenantId, createEmailTemplateBody: createEmailTemplateBody));
+    final result = api_instance.createEmailTemplate(tenantId, createEmailTemplateBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createEmailTemplate: $e\n');
@@ -732,7 +732,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createFeedPost**
-> CreateFeedPostsResponse createFeedPost(ApiCreateFeedPostRequest)
+> CreateFeedPostsResponse createFeedPost(tenantId, createFeedPostParams, ApiCreateFeedPostOptions options)
 
 
 
@@ -753,7 +753,7 @@ final doSpamCheck = true; // bool |
 final skipDupCheck = true; // bool | 
 
 try {
-    final result = api_instance.createFeedPost(ApiCreateFeedPostRequest(tenantId: tenantId, createFeedPostParams: createFeedPostParams, broadcastId: broadcastId, isLive: isLive, doSpamCheck: doSpamCheck, skipDupCheck: skipDupCheck));
+    final result = api_instance.createFeedPost(tenantId, createFeedPostParams, ApiCreateFeedPostOptions(broadcastId: broadcastId, isLive: isLive, doSpamCheck: doSpamCheck, skipDupCheck: skipDupCheck));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createFeedPost: $e\n');
@@ -787,7 +787,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createModerator**
-> CreateModeratorResponse createModerator(ApiCreateModeratorRequest)
+> CreateModeratorResponse createModerator(tenantId, createModeratorBody, )
 
 
 
@@ -804,7 +804,7 @@ final tenantId = tenantId_example; // String |
 final createModeratorBody = CreateModeratorBody(); // CreateModeratorBody | 
 
 try {
-    final result = api_instance.createModerator(ApiCreateModeratorRequest(tenantId: tenantId, createModeratorBody: createModeratorBody));
+    final result = api_instance.createModerator(tenantId, createModeratorBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createModerator: $e\n');
@@ -834,7 +834,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createQuestionConfig**
-> CreateQuestionConfigResponse createQuestionConfig(ApiCreateQuestionConfigRequest)
+> CreateQuestionConfigResponse createQuestionConfig(tenantId, createQuestionConfigBody, )
 
 
 
@@ -851,7 +851,7 @@ final tenantId = tenantId_example; // String |
 final createQuestionConfigBody = CreateQuestionConfigBody(); // CreateQuestionConfigBody | 
 
 try {
-    final result = api_instance.createQuestionConfig(ApiCreateQuestionConfigRequest(tenantId: tenantId, createQuestionConfigBody: createQuestionConfigBody));
+    final result = api_instance.createQuestionConfig(tenantId, createQuestionConfigBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createQuestionConfig: $e\n');
@@ -881,7 +881,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createQuestionResult**
-> CreateQuestionResultResponse createQuestionResult(ApiCreateQuestionResultRequest)
+> CreateQuestionResultResponse createQuestionResult(tenantId, createQuestionResultBody, )
 
 
 
@@ -898,7 +898,7 @@ final tenantId = tenantId_example; // String |
 final createQuestionResultBody = CreateQuestionResultBody(); // CreateQuestionResultBody | 
 
 try {
-    final result = api_instance.createQuestionResult(ApiCreateQuestionResultRequest(tenantId: tenantId, createQuestionResultBody: createQuestionResultBody));
+    final result = api_instance.createQuestionResult(tenantId, createQuestionResultBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createQuestionResult: $e\n');
@@ -928,7 +928,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createSubscription**
-> CreateSubscriptionAPIResponse createSubscription(ApiCreateSubscriptionRequest)
+> CreateSubscriptionAPIResponse createSubscription(tenantId, createAPIUserSubscriptionData, )
 
 
 
@@ -945,7 +945,7 @@ final tenantId = tenantId_example; // String |
 final createAPIUserSubscriptionData = CreateAPIUserSubscriptionData(); // CreateAPIUserSubscriptionData | 
 
 try {
-    final result = api_instance.createSubscription(ApiCreateSubscriptionRequest(tenantId: tenantId, createAPIUserSubscriptionData: createAPIUserSubscriptionData));
+    final result = api_instance.createSubscription(tenantId, createAPIUserSubscriptionData, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createSubscription: $e\n');
@@ -975,7 +975,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenant**
-> CreateTenantResponse createTenant(ApiCreateTenantRequest)
+> CreateTenantResponse createTenant(tenantId, createTenantBody, )
 
 
 
@@ -992,7 +992,7 @@ final tenantId = tenantId_example; // String |
 final createTenantBody = CreateTenantBody(); // CreateTenantBody | 
 
 try {
-    final result = api_instance.createTenant(ApiCreateTenantRequest(tenantId: tenantId, createTenantBody: createTenantBody));
+    final result = api_instance.createTenant(tenantId, createTenantBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenant: $e\n');
@@ -1022,7 +1022,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenantPackage**
-> CreateTenantPackageResponse createTenantPackage(ApiCreateTenantPackageRequest)
+> CreateTenantPackageResponse createTenantPackage(tenantId, createTenantPackageBody, )
 
 
 
@@ -1039,7 +1039,7 @@ final tenantId = tenantId_example; // String |
 final createTenantPackageBody = CreateTenantPackageBody(); // CreateTenantPackageBody | 
 
 try {
-    final result = api_instance.createTenantPackage(ApiCreateTenantPackageRequest(tenantId: tenantId, createTenantPackageBody: createTenantPackageBody));
+    final result = api_instance.createTenantPackage(tenantId, createTenantPackageBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenantPackage: $e\n');
@@ -1069,7 +1069,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenantUser**
-> CreateTenantUserResponse createTenantUser(ApiCreateTenantUserRequest)
+> CreateTenantUserResponse createTenantUser(tenantId, createTenantUserBody, )
 
 
 
@@ -1086,7 +1086,7 @@ final tenantId = tenantId_example; // String |
 final createTenantUserBody = CreateTenantUserBody(); // CreateTenantUserBody | 
 
 try {
-    final result = api_instance.createTenantUser(ApiCreateTenantUserRequest(tenantId: tenantId, createTenantUserBody: createTenantUserBody));
+    final result = api_instance.createTenantUser(tenantId, createTenantUserBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenantUser: $e\n');
@@ -1116,7 +1116,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTicket**
-> CreateTicketResponse createTicket(ApiCreateTicketRequest)
+> CreateTicketResponse createTicket(tenantId, userId, createTicketBody, )
 
 
 
@@ -1134,7 +1134,7 @@ final userId = userId_example; // String |
 final createTicketBody = CreateTicketBody(); // CreateTicketBody | 
 
 try {
-    final result = api_instance.createTicket(ApiCreateTicketRequest(tenantId: tenantId, userId: userId, createTicketBody: createTicketBody));
+    final result = api_instance.createTicket(tenantId, userId, createTicketBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTicket: $e\n');
@@ -1165,7 +1165,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUserBadge**
-> APICreateUserBadgeResponse createUserBadge(ApiCreateUserBadgeRequest)
+> APICreateUserBadgeResponse createUserBadge(tenantId, createUserBadgeParams, )
 
 
 
@@ -1182,7 +1182,7 @@ final tenantId = tenantId_example; // String |
 final createUserBadgeParams = CreateUserBadgeParams(); // CreateUserBadgeParams | 
 
 try {
-    final result = api_instance.createUserBadge(ApiCreateUserBadgeRequest(tenantId: tenantId, createUserBadgeParams: createUserBadgeParams));
+    final result = api_instance.createUserBadge(tenantId, createUserBadgeParams, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createUserBadge: $e\n');
@@ -1212,7 +1212,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createVote**
-> VoteResponse createVote(ApiCreateVoteRequest)
+> VoteResponse createVote(tenantId, commentId, direction, ApiCreateVoteOptions options)
 
 
 
@@ -1232,7 +1232,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.createVote(ApiCreateVoteRequest(tenantId: tenantId, commentId: commentId, direction: direction, userId: userId, anonUserId: anonUserId));
+    final result = api_instance.createVote(tenantId, commentId, direction, ApiCreateVoteOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createVote: $e\n');
@@ -1265,7 +1265,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteComment**
-> DeleteCommentResult deleteComment(ApiDeleteCommentRequest)
+> DeleteCommentResult deleteComment(tenantId, id, ApiDeleteCommentOptions options)
 
 
 
@@ -1284,7 +1284,7 @@ final contextUserId = contextUserId_example; // String |
 final isLive = true; // bool | 
 
 try {
-    final result = api_instance.deleteComment(ApiDeleteCommentRequest(tenantId: tenantId, id: id, contextUserId: contextUserId, isLive: isLive));
+    final result = api_instance.deleteComment(tenantId, id, ApiDeleteCommentOptions(contextUserId: contextUserId, isLive: isLive));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteComment: $e\n');
@@ -1316,7 +1316,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteDomainConfig**
-> DeleteDomainConfigResponse deleteDomainConfig(ApiDeleteDomainConfigRequest)
+> DeleteDomainConfigResponse deleteDomainConfig(tenantId, domain, )
 
 
 
@@ -1333,7 +1333,7 @@ final tenantId = tenantId_example; // String |
 final domain = domain_example; // String | 
 
 try {
-    final result = api_instance.deleteDomainConfig(ApiDeleteDomainConfigRequest(tenantId: tenantId, domain: domain));
+    final result = api_instance.deleteDomainConfig(tenantId, domain, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteDomainConfig: $e\n');
@@ -1363,7 +1363,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteEmailTemplate**
-> APIEmptyResponse deleteEmailTemplate(ApiDeleteEmailTemplateRequest)
+> APIEmptyResponse deleteEmailTemplate(tenantId, id, )
 
 
 
@@ -1380,7 +1380,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteEmailTemplate(ApiDeleteEmailTemplateRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deleteEmailTemplate(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteEmailTemplate: $e\n');
@@ -1410,7 +1410,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteEmailTemplateRenderError**
-> APIEmptyResponse deleteEmailTemplateRenderError(ApiDeleteEmailTemplateRenderErrorRequest)
+> APIEmptyResponse deleteEmailTemplateRenderError(tenantId, id, errorId, )
 
 
 
@@ -1428,7 +1428,7 @@ final id = id_example; // String |
 final errorId = errorId_example; // String | 
 
 try {
-    final result = api_instance.deleteEmailTemplateRenderError(ApiDeleteEmailTemplateRenderErrorRequest(tenantId: tenantId, id: id, errorId: errorId));
+    final result = api_instance.deleteEmailTemplateRenderError(tenantId, id, errorId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteEmailTemplateRenderError: $e\n');
@@ -1459,7 +1459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteHashTag**
-> APIEmptyResponse deleteHashTag(ApiDeleteHashTagRequest)
+> APIEmptyResponse deleteHashTag(tag, deleteHashTagRequestBody, ApiDeleteHashTagOptions options)
 
 
 
@@ -1477,7 +1477,7 @@ final tenantId = tenantId_example; // String |
 final deleteHashTagRequestBody = DeleteHashTagRequestBody(); // DeleteHashTagRequestBody | 
 
 try {
-    final result = api_instance.deleteHashTag(ApiDeleteHashTagRequest(tag: tag, tenantId: tenantId, deleteHashTagRequestBody: deleteHashTagRequestBody));
+    final result = api_instance.deleteHashTag(tag, deleteHashTagRequestBody, ApiDeleteHashTagOptions(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteHashTag: $e\n');
@@ -1508,7 +1508,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteModerator**
-> APIEmptyResponse deleteModerator(ApiDeleteModeratorRequest)
+> APIEmptyResponse deleteModerator(tenantId, id, ApiDeleteModeratorOptions options)
 
 
 
@@ -1526,7 +1526,7 @@ final id = id_example; // String |
 final sendEmail = sendEmail_example; // String | 
 
 try {
-    final result = api_instance.deleteModerator(ApiDeleteModeratorRequest(tenantId: tenantId, id: id, sendEmail: sendEmail));
+    final result = api_instance.deleteModerator(tenantId, id, ApiDeleteModeratorOptions(sendEmail: sendEmail));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteModerator: $e\n');
@@ -1557,7 +1557,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteNotificationCount**
-> APIEmptyResponse deleteNotificationCount(ApiDeleteNotificationCountRequest)
+> APIEmptyResponse deleteNotificationCount(tenantId, id, )
 
 
 
@@ -1574,7 +1574,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteNotificationCount(ApiDeleteNotificationCountRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deleteNotificationCount(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteNotificationCount: $e\n');
@@ -1604,7 +1604,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deletePage**
-> DeletePageAPIResponse deletePage(ApiDeletePageRequest)
+> DeletePageAPIResponse deletePage(tenantId, id, )
 
 
 
@@ -1621,7 +1621,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deletePage(ApiDeletePageRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deletePage(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deletePage: $e\n');
@@ -1651,7 +1651,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deletePendingWebhookEvent**
-> APIEmptyResponse deletePendingWebhookEvent(ApiDeletePendingWebhookEventRequest)
+> APIEmptyResponse deletePendingWebhookEvent(tenantId, id, )
 
 
 
@@ -1668,7 +1668,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deletePendingWebhookEvent(ApiDeletePendingWebhookEventRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deletePendingWebhookEvent(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deletePendingWebhookEvent: $e\n');
@@ -1698,7 +1698,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteQuestionConfig**
-> APIEmptyResponse deleteQuestionConfig(ApiDeleteQuestionConfigRequest)
+> APIEmptyResponse deleteQuestionConfig(tenantId, id, )
 
 
 
@@ -1715,7 +1715,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteQuestionConfig(ApiDeleteQuestionConfigRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deleteQuestionConfig(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteQuestionConfig: $e\n');
@@ -1745,7 +1745,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteQuestionResult**
-> APIEmptyResponse deleteQuestionResult(ApiDeleteQuestionResultRequest)
+> APIEmptyResponse deleteQuestionResult(tenantId, id, )
 
 
 
@@ -1762,7 +1762,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteQuestionResult(ApiDeleteQuestionResultRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deleteQuestionResult(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteQuestionResult: $e\n');
@@ -1792,7 +1792,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteSSOUser**
-> DeleteSSOUserAPIResponse deleteSSOUser(ApiDeleteSSOUserRequest)
+> DeleteSSOUserAPIResponse deleteSSOUser(tenantId, id, ApiDeleteSSOUserOptions options)
 
 
 
@@ -1811,7 +1811,7 @@ final deleteComments = true; // bool |
 final commentDeleteMode = commentDeleteMode_example; // String | 
 
 try {
-    final result = api_instance.deleteSSOUser(ApiDeleteSSOUserRequest(tenantId: tenantId, id: id, deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
+    final result = api_instance.deleteSSOUser(tenantId, id, ApiDeleteSSOUserOptions(deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteSSOUser: $e\n');
@@ -1843,7 +1843,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteSubscription**
-> DeleteSubscriptionAPIResponse deleteSubscription(ApiDeleteSubscriptionRequest)
+> DeleteSubscriptionAPIResponse deleteSubscription(tenantId, id, ApiDeleteSubscriptionOptions options)
 
 
 
@@ -1861,7 +1861,7 @@ final id = id_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.deleteSubscription(ApiDeleteSubscriptionRequest(tenantId: tenantId, id: id, userId: userId));
+    final result = api_instance.deleteSubscription(tenantId, id, ApiDeleteSubscriptionOptions(userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteSubscription: $e\n');
@@ -1892,7 +1892,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenant**
-> APIEmptyResponse deleteTenant(ApiDeleteTenantRequest)
+> APIEmptyResponse deleteTenant(tenantId, id, ApiDeleteTenantOptions options)
 
 
 
@@ -1910,7 +1910,7 @@ final id = id_example; // String |
 final sure = sure_example; // String | 
 
 try {
-    final result = api_instance.deleteTenant(ApiDeleteTenantRequest(tenantId: tenantId, id: id, sure: sure));
+    final result = api_instance.deleteTenant(tenantId, id, ApiDeleteTenantOptions(sure: sure));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenant: $e\n');
@@ -1941,7 +1941,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenantPackage**
-> APIEmptyResponse deleteTenantPackage(ApiDeleteTenantPackageRequest)
+> APIEmptyResponse deleteTenantPackage(tenantId, id, )
 
 
 
@@ -1958,7 +1958,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteTenantPackage(ApiDeleteTenantPackageRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deleteTenantPackage(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenantPackage: $e\n');
@@ -1988,7 +1988,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenantUser**
-> APIEmptyResponse deleteTenantUser(ApiDeleteTenantUserRequest)
+> APIEmptyResponse deleteTenantUser(tenantId, id, ApiDeleteTenantUserOptions options)
 
 
 
@@ -2007,7 +2007,7 @@ final deleteComments = deleteComments_example; // String |
 final commentDeleteMode = commentDeleteMode_example; // String | 
 
 try {
-    final result = api_instance.deleteTenantUser(ApiDeleteTenantUserRequest(tenantId: tenantId, id: id, deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
+    final result = api_instance.deleteTenantUser(tenantId, id, ApiDeleteTenantUserOptions(deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenantUser: $e\n');
@@ -2039,7 +2039,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteUserBadge**
-> APIEmptySuccessResponse deleteUserBadge(ApiDeleteUserBadgeRequest)
+> APIEmptySuccessResponse deleteUserBadge(tenantId, id, )
 
 
 
@@ -2056,7 +2056,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteUserBadge(ApiDeleteUserBadgeRequest(tenantId: tenantId, id: id));
+    final result = api_instance.deleteUserBadge(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteUserBadge: $e\n');
@@ -2086,7 +2086,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteVote**
-> VoteDeleteResponse deleteVote(ApiDeleteVoteRequest)
+> VoteDeleteResponse deleteVote(tenantId, id, ApiDeleteVoteOptions options)
 
 
 
@@ -2104,7 +2104,7 @@ final id = id_example; // String |
 final editKey = editKey_example; // String | 
 
 try {
-    final result = api_instance.deleteVote(ApiDeleteVoteRequest(tenantId: tenantId, id: id, editKey: editKey));
+    final result = api_instance.deleteVote(tenantId, id, ApiDeleteVoteOptions(editKey: editKey));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteVote: $e\n');
@@ -2135,7 +2135,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **flagComment**
-> FlagCommentResponse flagComment(ApiFlagCommentRequest)
+> FlagCommentResponse flagComment(tenantId, id, ApiFlagCommentOptions options)
 
 
 
@@ -2154,7 +2154,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.flagComment(ApiFlagCommentRequest(tenantId: tenantId, id: id, userId: userId, anonUserId: anonUserId));
+    final result = api_instance.flagComment(tenantId, id, ApiFlagCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->flagComment: $e\n');
@@ -2186,7 +2186,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getAuditLogs**
-> GetAuditLogsResponse getAuditLogs(ApiGetAuditLogsRequest)
+> GetAuditLogsResponse getAuditLogs(tenantId, ApiGetAuditLogsOptions options)
 
 
 
@@ -2207,7 +2207,7 @@ final after = 1.2; // double |
 final before = 1.2; // double | 
 
 try {
-    final result = api_instance.getAuditLogs(ApiGetAuditLogsRequest(tenantId: tenantId, limit: limit, skip: skip, order: order, after: after, before: before));
+    final result = api_instance.getAuditLogs(tenantId, ApiGetAuditLogsOptions(limit: limit, skip: skip, order: order, after: after, before: before));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getAuditLogs: $e\n');
@@ -2241,7 +2241,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCachedNotificationCount**
-> GetCachedNotificationCountResponse getCachedNotificationCount(ApiGetCachedNotificationCountRequest)
+> GetCachedNotificationCountResponse getCachedNotificationCount(tenantId, id, )
 
 
 
@@ -2258,7 +2258,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getCachedNotificationCount(ApiGetCachedNotificationCountRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getCachedNotificationCount(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getCachedNotificationCount: $e\n');
@@ -2288,7 +2288,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getComment**
-> APIGetCommentResponse getComment(ApiGetCommentRequest)
+> APIGetCommentResponse getComment(tenantId, id, )
 
 
 
@@ -2305,7 +2305,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getComment(ApiGetCommentRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getComment(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getComment: $e\n');
@@ -2335,7 +2335,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getComments**
-> APIGetCommentsResponse getComments(ApiGetCommentsRequest)
+> APIGetCommentsResponse getComments(tenantId, ApiGetCommentsOptions options)
 
 
 
@@ -2367,7 +2367,7 @@ final fromDate = 789; // int |
 final toDate = 789; // int | 
 
 try {
-    final result = api_instance.getComments(ApiGetCommentsRequest(tenantId: tenantId, page: page, limit: limit, skip: skip, asTree: asTree, skipChildren: skipChildren, limitChildren: limitChildren, maxTreeDepth: maxTreeDepth, urlId: urlId, userId: userId, anonUserId: anonUserId, contextUserId: contextUserId, hashTag: hashTag, parentId: parentId, direction: direction, fromDate: fromDate, toDate: toDate));
+    final result = api_instance.getComments(tenantId, ApiGetCommentsOptions(page: page, limit: limit, skip: skip, asTree: asTree, skipChildren: skipChildren, limitChildren: limitChildren, maxTreeDepth: maxTreeDepth, urlId: urlId, userId: userId, anonUserId: anonUserId, contextUserId: contextUserId, hashTag: hashTag, parentId: parentId, direction: direction, fromDate: fromDate, toDate: toDate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getComments: $e\n');
@@ -2412,7 +2412,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getDomainConfig**
-> GetDomainConfigResponse getDomainConfig(ApiGetDomainConfigRequest)
+> GetDomainConfigResponse getDomainConfig(tenantId, domain, )
 
 
 
@@ -2429,7 +2429,7 @@ final tenantId = tenantId_example; // String |
 final domain = domain_example; // String | 
 
 try {
-    final result = api_instance.getDomainConfig(ApiGetDomainConfigRequest(tenantId: tenantId, domain: domain));
+    final result = api_instance.getDomainConfig(tenantId, domain, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getDomainConfig: $e\n');
@@ -2459,7 +2459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getDomainConfigs**
-> GetDomainConfigsResponse getDomainConfigs(ApiGetDomainConfigsRequest)
+> GetDomainConfigsResponse getDomainConfigs(tenantId, )
 
 
 
@@ -2475,7 +2475,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getDomainConfigs(ApiGetDomainConfigsRequest(tenantId: tenantId));
+    final result = api_instance.getDomainConfigs(tenantId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getDomainConfigs: $e\n');
@@ -2504,7 +2504,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplate**
-> GetEmailTemplateResponse getEmailTemplate(ApiGetEmailTemplateRequest)
+> GetEmailTemplateResponse getEmailTemplate(tenantId, id, )
 
 
 
@@ -2521,7 +2521,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getEmailTemplate(ApiGetEmailTemplateRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getEmailTemplate(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplate: $e\n');
@@ -2551,7 +2551,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplateDefinitions**
-> GetEmailTemplateDefinitionsResponse getEmailTemplateDefinitions(ApiGetEmailTemplateDefinitionsRequest)
+> GetEmailTemplateDefinitionsResponse getEmailTemplateDefinitions(tenantId, )
 
 
 
@@ -2567,7 +2567,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getEmailTemplateDefinitions(ApiGetEmailTemplateDefinitionsRequest(tenantId: tenantId));
+    final result = api_instance.getEmailTemplateDefinitions(tenantId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplateDefinitions: $e\n');
@@ -2596,7 +2596,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplateRenderErrors**
-> GetEmailTemplateRenderErrorsResponse getEmailTemplateRenderErrors(ApiGetEmailTemplateRenderErrorsRequest)
+> GetEmailTemplateRenderErrorsResponse getEmailTemplateRenderErrors(tenantId, id, ApiGetEmailTemplateRenderErrorsOptions options)
 
 
 
@@ -2614,7 +2614,7 @@ final id = id_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getEmailTemplateRenderErrors(ApiGetEmailTemplateRenderErrorsRequest(tenantId: tenantId, id: id, skip: skip));
+    final result = api_instance.getEmailTemplateRenderErrors(tenantId, id, ApiGetEmailTemplateRenderErrorsOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplateRenderErrors: $e\n');
@@ -2645,7 +2645,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplates**
-> GetEmailTemplatesResponse getEmailTemplates(ApiGetEmailTemplatesRequest)
+> GetEmailTemplatesResponse getEmailTemplates(tenantId, ApiGetEmailTemplatesOptions options)
 
 
 
@@ -2662,7 +2662,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getEmailTemplates(ApiGetEmailTemplatesRequest(tenantId: tenantId, skip: skip));
+    final result = api_instance.getEmailTemplates(tenantId, ApiGetEmailTemplatesOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplates: $e\n');
@@ -2692,7 +2692,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPosts**
-> GetFeedPostsResponse getFeedPosts(ApiGetFeedPostsRequest)
+> GetFeedPostsResponse getFeedPosts(tenantId, ApiGetFeedPostsOptions options)
 
 
 
@@ -2713,7 +2713,7 @@ final limit = 56; // int |
 final tags = []; // List<String> | 
 
 try {
-    final result = api_instance.getFeedPosts(ApiGetFeedPostsRequest(tenantId: tenantId, afterId: afterId, limit: limit, tags: tags));
+    final result = api_instance.getFeedPosts(tenantId, ApiGetFeedPostsOptions(afterId: afterId, limit: limit, tags: tags));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getFeedPosts: $e\n');
@@ -2745,7 +2745,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getHashTags**
-> GetHashTagsResponse getHashTags(ApiGetHashTagsRequest)
+> GetHashTagsResponse getHashTags(tenantId, ApiGetHashTagsOptions options)
 
 
 
@@ -2762,7 +2762,7 @@ final tenantId = tenantId_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getHashTags(ApiGetHashTagsRequest(tenantId: tenantId, page: page));
+    final result = api_instance.getHashTags(tenantId, ApiGetHashTagsOptions(page: page));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getHashTags: $e\n');
@@ -2792,7 +2792,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerator**
-> GetModeratorResponse getModerator(ApiGetModeratorRequest)
+> GetModeratorResponse getModerator(tenantId, id, )
 
 
 
@@ -2809,7 +2809,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getModerator(ApiGetModeratorRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getModerator(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getModerator: $e\n');
@@ -2839,7 +2839,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerators**
-> GetModeratorsResponse getModerators(ApiGetModeratorsRequest)
+> GetModeratorsResponse getModerators(tenantId, ApiGetModeratorsOptions options)
 
 
 
@@ -2856,7 +2856,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getModerators(ApiGetModeratorsRequest(tenantId: tenantId, skip: skip));
+    final result = api_instance.getModerators(tenantId, ApiGetModeratorsOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getModerators: $e\n');
@@ -2886,7 +2886,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getNotificationCount**
-> GetNotificationCountResponse getNotificationCount(ApiGetNotificationCountRequest)
+> GetNotificationCountResponse getNotificationCount(tenantId, ApiGetNotificationCountOptions options)
 
 
 
@@ -2907,7 +2907,7 @@ final viewed = true; // bool |
 final type = type_example; // String | 
 
 try {
-    final result = api_instance.getNotificationCount(ApiGetNotificationCountRequest(tenantId: tenantId, userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type));
+    final result = api_instance.getNotificationCount(tenantId, ApiGetNotificationCountOptions(userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getNotificationCount: $e\n');
@@ -2941,7 +2941,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getNotifications**
-> GetNotificationsResponse getNotifications(ApiGetNotificationsRequest)
+> GetNotificationsResponse getNotifications(tenantId, ApiGetNotificationsOptions options)
 
 
 
@@ -2963,7 +2963,7 @@ final type = type_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getNotifications(ApiGetNotificationsRequest(tenantId: tenantId, userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, skip: skip));
+    final result = api_instance.getNotifications(tenantId, ApiGetNotificationsOptions(userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getNotifications: $e\n');
@@ -2998,7 +2998,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPageByURLId**
-> GetPageByURLIdAPIResponse getPageByURLId(ApiGetPageByURLIdRequest)
+> GetPageByURLIdAPIResponse getPageByURLId(tenantId, urlId, )
 
 
 
@@ -3015,7 +3015,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getPageByURLId(ApiGetPageByURLIdRequest(tenantId: tenantId, urlId: urlId));
+    final result = api_instance.getPageByURLId(tenantId, urlId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPageByURLId: $e\n');
@@ -3045,7 +3045,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPages**
-> GetPagesAPIResponse getPages(ApiGetPagesRequest)
+> GetPagesAPIResponse getPages(tenantId, )
 
 
 
@@ -3061,7 +3061,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getPages(ApiGetPagesRequest(tenantId: tenantId));
+    final result = api_instance.getPages(tenantId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPages: $e\n');
@@ -3090,7 +3090,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPendingWebhookEventCount**
-> GetPendingWebhookEventCountResponse getPendingWebhookEventCount(ApiGetPendingWebhookEventCountRequest)
+> GetPendingWebhookEventCountResponse getPendingWebhookEventCount(tenantId, ApiGetPendingWebhookEventCountOptions options)
 
 
 
@@ -3112,7 +3112,7 @@ final domain = domain_example; // String |
 final attemptCountGT = 1.2; // double | 
 
 try {
-    final result = api_instance.getPendingWebhookEventCount(ApiGetPendingWebhookEventCountRequest(tenantId: tenantId, commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT));
+    final result = api_instance.getPendingWebhookEventCount(tenantId, ApiGetPendingWebhookEventCountOptions(commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPendingWebhookEventCount: $e\n');
@@ -3147,7 +3147,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPendingWebhookEvents**
-> GetPendingWebhookEventsResponse getPendingWebhookEvents(ApiGetPendingWebhookEventsRequest)
+> GetPendingWebhookEventsResponse getPendingWebhookEvents(tenantId, ApiGetPendingWebhookEventsOptions options)
 
 
 
@@ -3170,7 +3170,7 @@ final attemptCountGT = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getPendingWebhookEvents(ApiGetPendingWebhookEventsRequest(tenantId: tenantId, commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, skip: skip));
+    final result = api_instance.getPendingWebhookEvents(tenantId, ApiGetPendingWebhookEventsOptions(commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPendingWebhookEvents: $e\n');
@@ -3206,7 +3206,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionConfig**
-> GetQuestionConfigResponse getQuestionConfig(ApiGetQuestionConfigRequest)
+> GetQuestionConfigResponse getQuestionConfig(tenantId, id, )
 
 
 
@@ -3223,7 +3223,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getQuestionConfig(ApiGetQuestionConfigRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getQuestionConfig(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionConfig: $e\n');
@@ -3253,7 +3253,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionConfigs**
-> GetQuestionConfigsResponse getQuestionConfigs(ApiGetQuestionConfigsRequest)
+> GetQuestionConfigsResponse getQuestionConfigs(tenantId, ApiGetQuestionConfigsOptions options)
 
 
 
@@ -3270,7 +3270,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getQuestionConfigs(ApiGetQuestionConfigsRequest(tenantId: tenantId, skip: skip));
+    final result = api_instance.getQuestionConfigs(tenantId, ApiGetQuestionConfigsOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionConfigs: $e\n');
@@ -3300,7 +3300,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionResult**
-> GetQuestionResultResponse getQuestionResult(ApiGetQuestionResultRequest)
+> GetQuestionResultResponse getQuestionResult(tenantId, id, )
 
 
 
@@ -3317,7 +3317,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getQuestionResult(ApiGetQuestionResultRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getQuestionResult(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionResult: $e\n');
@@ -3347,7 +3347,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionResults**
-> GetQuestionResultsResponse getQuestionResults(ApiGetQuestionResultsRequest)
+> GetQuestionResultsResponse getQuestionResults(tenantId, ApiGetQuestionResultsOptions options)
 
 
 
@@ -3369,7 +3369,7 @@ final questionIds = questionIds_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getQuestionResults(ApiGetQuestionResultsRequest(tenantId: tenantId, urlId: urlId, userId: userId, startDate: startDate, questionId: questionId, questionIds: questionIds, skip: skip));
+    final result = api_instance.getQuestionResults(tenantId, ApiGetQuestionResultsOptions(urlId: urlId, userId: userId, startDate: startDate, questionId: questionId, questionIds: questionIds, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionResults: $e\n');
@@ -3404,7 +3404,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUserByEmail**
-> GetSSOUserByEmailAPIResponse getSSOUserByEmail(ApiGetSSOUserByEmailRequest)
+> GetSSOUserByEmailAPIResponse getSSOUserByEmail(tenantId, email, )
 
 
 
@@ -3421,7 +3421,7 @@ final tenantId = tenantId_example; // String |
 final email = email_example; // String | 
 
 try {
-    final result = api_instance.getSSOUserByEmail(ApiGetSSOUserByEmailRequest(tenantId: tenantId, email: email));
+    final result = api_instance.getSSOUserByEmail(tenantId, email, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUserByEmail: $e\n');
@@ -3451,7 +3451,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUserById**
-> GetSSOUserByIdAPIResponse getSSOUserById(ApiGetSSOUserByIdRequest)
+> GetSSOUserByIdAPIResponse getSSOUserById(tenantId, id, )
 
 
 
@@ -3468,7 +3468,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getSSOUserById(ApiGetSSOUserByIdRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getSSOUserById(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUserById: $e\n');
@@ -3498,7 +3498,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUsers**
-> GetSSOUsersResponse getSSOUsers(ApiGetSSOUsersRequest)
+> GetSSOUsersResponse getSSOUsers(tenantId, ApiGetSSOUsersOptions options)
 
 
 
@@ -3515,7 +3515,7 @@ final tenantId = tenantId_example; // String |
 final skip = 56; // int | 
 
 try {
-    final result = api_instance.getSSOUsers(ApiGetSSOUsersRequest(tenantId: tenantId, skip: skip));
+    final result = api_instance.getSSOUsers(tenantId, ApiGetSSOUsersOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUsers: $e\n');
@@ -3545,7 +3545,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSubscriptions**
-> GetSubscriptionsAPIResponse getSubscriptions(ApiGetSubscriptionsRequest)
+> GetSubscriptionsAPIResponse getSubscriptions(tenantId, ApiGetSubscriptionsOptions options)
 
 
 
@@ -3562,7 +3562,7 @@ final tenantId = tenantId_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getSubscriptions(ApiGetSubscriptionsRequest(tenantId: tenantId, userId: userId));
+    final result = api_instance.getSubscriptions(tenantId, ApiGetSubscriptionsOptions(userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSubscriptions: $e\n');
@@ -3592,7 +3592,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenant**
-> GetTenantResponse getTenant(ApiGetTenantRequest)
+> GetTenantResponse getTenant(tenantId, id, )
 
 
 
@@ -3609,7 +3609,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenant(ApiGetTenantRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getTenant(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenant: $e\n');
@@ -3639,7 +3639,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantDailyUsages**
-> GetTenantDailyUsagesResponse getTenantDailyUsages(ApiGetTenantDailyUsagesRequest)
+> GetTenantDailyUsagesResponse getTenantDailyUsages(tenantId, ApiGetTenantDailyUsagesOptions options)
 
 
 
@@ -3659,7 +3659,7 @@ final dayNumber = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantDailyUsages(ApiGetTenantDailyUsagesRequest(tenantId: tenantId, yearNumber: yearNumber, monthNumber: monthNumber, dayNumber: dayNumber, skip: skip));
+    final result = api_instance.getTenantDailyUsages(tenantId, ApiGetTenantDailyUsagesOptions(yearNumber: yearNumber, monthNumber: monthNumber, dayNumber: dayNumber, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantDailyUsages: $e\n');
@@ -3692,7 +3692,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantPackage**
-> GetTenantPackageResponse getTenantPackage(ApiGetTenantPackageRequest)
+> GetTenantPackageResponse getTenantPackage(tenantId, id, )
 
 
 
@@ -3709,7 +3709,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenantPackage(ApiGetTenantPackageRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getTenantPackage(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantPackage: $e\n');
@@ -3739,7 +3739,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantPackages**
-> GetTenantPackagesResponse getTenantPackages(ApiGetTenantPackagesRequest)
+> GetTenantPackagesResponse getTenantPackages(tenantId, ApiGetTenantPackagesOptions options)
 
 
 
@@ -3756,7 +3756,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantPackages(ApiGetTenantPackagesRequest(tenantId: tenantId, skip: skip));
+    final result = api_instance.getTenantPackages(tenantId, ApiGetTenantPackagesOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantPackages: $e\n');
@@ -3786,7 +3786,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantUser**
-> GetTenantUserResponse getTenantUser(ApiGetTenantUserRequest)
+> GetTenantUserResponse getTenantUser(tenantId, id, )
 
 
 
@@ -3803,7 +3803,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenantUser(ApiGetTenantUserRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getTenantUser(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantUser: $e\n');
@@ -3833,7 +3833,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantUsers**
-> GetTenantUsersResponse getTenantUsers(ApiGetTenantUsersRequest)
+> GetTenantUsersResponse getTenantUsers(tenantId, ApiGetTenantUsersOptions options)
 
 
 
@@ -3850,7 +3850,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantUsers(ApiGetTenantUsersRequest(tenantId: tenantId, skip: skip));
+    final result = api_instance.getTenantUsers(tenantId, ApiGetTenantUsersOptions(skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantUsers: $e\n');
@@ -3880,7 +3880,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenants**
-> GetTenantsResponse getTenants(ApiGetTenantsRequest)
+> GetTenantsResponse getTenants(tenantId, ApiGetTenantsOptions options)
 
 
 
@@ -3898,7 +3898,7 @@ final meta = meta_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenants(ApiGetTenantsRequest(tenantId: tenantId, meta: meta, skip: skip));
+    final result = api_instance.getTenants(tenantId, ApiGetTenantsOptions(meta: meta, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenants: $e\n');
@@ -3929,7 +3929,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTicket**
-> GetTicketResponse getTicket(ApiGetTicketRequest)
+> GetTicketResponse getTicket(tenantId, id, ApiGetTicketOptions options)
 
 
 
@@ -3947,7 +3947,7 @@ final id = id_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getTicket(ApiGetTicketRequest(tenantId: tenantId, id: id, userId: userId));
+    final result = api_instance.getTicket(tenantId, id, ApiGetTicketOptions(userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTicket: $e\n');
@@ -3978,7 +3978,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTickets**
-> GetTicketsResponse getTickets(ApiGetTicketsRequest)
+> GetTicketsResponse getTickets(tenantId, ApiGetTicketsOptions options)
 
 
 
@@ -3998,7 +3998,7 @@ final skip = 1.2; // double |
 final limit = 1.2; // double | 
 
 try {
-    final result = api_instance.getTickets(ApiGetTicketsRequest(tenantId: tenantId, userId: userId, state: state, skip: skip, limit: limit));
+    final result = api_instance.getTickets(tenantId, ApiGetTicketsOptions(userId: userId, state: state, skip: skip, limit: limit));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTickets: $e\n');
@@ -4031,7 +4031,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUser**
-> GetUserResponse getUser(ApiGetUserRequest)
+> GetUserResponse getUser(tenantId, id, )
 
 
 
@@ -4048,7 +4048,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUser(ApiGetUserRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getUser(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUser: $e\n');
@@ -4078,7 +4078,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadge**
-> APIGetUserBadgeResponse getUserBadge(ApiGetUserBadgeRequest)
+> APIGetUserBadgeResponse getUserBadge(tenantId, id, )
 
 
 
@@ -4095,7 +4095,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUserBadge(ApiGetUserBadgeRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getUserBadge(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadge: $e\n');
@@ -4125,7 +4125,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressById**
-> APIGetUserBadgeProgressResponse getUserBadgeProgressById(ApiGetUserBadgeProgressByIdRequest)
+> APIGetUserBadgeProgressResponse getUserBadgeProgressById(tenantId, id, )
 
 
 
@@ -4142,7 +4142,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUserBadgeProgressById(ApiGetUserBadgeProgressByIdRequest(tenantId: tenantId, id: id));
+    final result = api_instance.getUserBadgeProgressById(tenantId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressById: $e\n');
@@ -4172,7 +4172,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressByUserId**
-> APIGetUserBadgeProgressResponse getUserBadgeProgressByUserId(ApiGetUserBadgeProgressByUserIdRequest)
+> APIGetUserBadgeProgressResponse getUserBadgeProgressByUserId(tenantId, userId, )
 
 
 
@@ -4189,7 +4189,7 @@ final tenantId = tenantId_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getUserBadgeProgressByUserId(ApiGetUserBadgeProgressByUserIdRequest(tenantId: tenantId, userId: userId));
+    final result = api_instance.getUserBadgeProgressByUserId(tenantId, userId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressByUserId: $e\n');
@@ -4219,7 +4219,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressList**
-> APIGetUserBadgeProgressListResponse getUserBadgeProgressList(ApiGetUserBadgeProgressListRequest)
+> APIGetUserBadgeProgressListResponse getUserBadgeProgressList(tenantId, ApiGetUserBadgeProgressListOptions options)
 
 
 
@@ -4238,7 +4238,7 @@ final limit = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getUserBadgeProgressList(ApiGetUserBadgeProgressListRequest(tenantId: tenantId, userId: userId, limit: limit, skip: skip));
+    final result = api_instance.getUserBadgeProgressList(tenantId, ApiGetUserBadgeProgressListOptions(userId: userId, limit: limit, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressList: $e\n');
@@ -4270,7 +4270,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadges**
-> APIGetUserBadgesResponse getUserBadges(ApiGetUserBadgesRequest)
+> APIGetUserBadgesResponse getUserBadges(tenantId, ApiGetUserBadgesOptions options)
 
 
 
@@ -4292,7 +4292,7 @@ final limit = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getUserBadges(ApiGetUserBadgesRequest(tenantId: tenantId, userId: userId, badgeId: badgeId, type: type, displayedOnComments: displayedOnComments, limit: limit, skip: skip));
+    final result = api_instance.getUserBadges(tenantId, ApiGetUserBadgesOptions(userId: userId, badgeId: badgeId, type: type, displayedOnComments: displayedOnComments, limit: limit, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadges: $e\n');
@@ -4327,7 +4327,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getVotes**
-> GetVotesResponse getVotes(ApiGetVotesRequest)
+> GetVotesResponse getVotes(tenantId, urlId, )
 
 
 
@@ -4344,7 +4344,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getVotes(ApiGetVotesRequest(tenantId: tenantId, urlId: urlId));
+    final result = api_instance.getVotes(tenantId, urlId, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getVotes: $e\n');
@@ -4374,7 +4374,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getVotesForUser**
-> GetVotesForUserResponse getVotesForUser(ApiGetVotesForUserRequest)
+> GetVotesForUserResponse getVotesForUser(tenantId, urlId, ApiGetVotesForUserOptions options)
 
 
 
@@ -4393,7 +4393,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.getVotesForUser(ApiGetVotesForUserRequest(tenantId: tenantId, urlId: urlId, userId: userId, anonUserId: anonUserId));
+    final result = api_instance.getVotesForUser(tenantId, urlId, ApiGetVotesForUserOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getVotesForUser: $e\n');
@@ -4425,7 +4425,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchDomainConfig**
-> PatchDomainConfigResponse patchDomainConfig(ApiPatchDomainConfigRequest)
+> PatchDomainConfigResponse patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams, )
 
 
 
@@ -4443,7 +4443,7 @@ final domainToUpdate = domainToUpdate_example; // String |
 final patchDomainConfigParams = PatchDomainConfigParams(); // PatchDomainConfigParams | 
 
 try {
-    final result = api_instance.patchDomainConfig(ApiPatchDomainConfigRequest(tenantId: tenantId, domainToUpdate: domainToUpdate, patchDomainConfigParams: patchDomainConfigParams));
+    final result = api_instance.patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchDomainConfig: $e\n');
@@ -4474,7 +4474,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchHashTag**
-> UpdateHashTagResponse patchHashTag(ApiPatchHashTagRequest)
+> UpdateHashTagResponse patchHashTag(tag, updateHashTagBody, ApiPatchHashTagOptions options)
 
 
 
@@ -4492,7 +4492,7 @@ final tenantId = tenantId_example; // String |
 final updateHashTagBody = UpdateHashTagBody(); // UpdateHashTagBody | 
 
 try {
-    final result = api_instance.patchHashTag(ApiPatchHashTagRequest(tag: tag, tenantId: tenantId, updateHashTagBody: updateHashTagBody));
+    final result = api_instance.patchHashTag(tag, updateHashTagBody, ApiPatchHashTagOptions(tenantId: tenantId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchHashTag: $e\n');
@@ -4523,7 +4523,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchPage**
-> PatchPageAPIResponse patchPage(ApiPatchPageRequest)
+> PatchPageAPIResponse patchPage(tenantId, id, updateAPIPageData, )
 
 
 
@@ -4541,7 +4541,7 @@ final id = id_example; // String |
 final updateAPIPageData = UpdateAPIPageData(); // UpdateAPIPageData | 
 
 try {
-    final result = api_instance.patchPage(ApiPatchPageRequest(tenantId: tenantId, id: id, updateAPIPageData: updateAPIPageData));
+    final result = api_instance.patchPage(tenantId, id, updateAPIPageData, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchPage: $e\n');
@@ -4572,7 +4572,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchSSOUser**
-> PatchSSOUserAPIResponse patchSSOUser(ApiPatchSSOUserRequest)
+> PatchSSOUserAPIResponse patchSSOUser(tenantId, id, updateAPISSOUserData, ApiPatchSSOUserOptions options)
 
 
 
@@ -4591,7 +4591,7 @@ final updateAPISSOUserData = UpdateAPISSOUserData(); // UpdateAPISSOUserData |
 final updateComments = true; // bool | 
 
 try {
-    final result = api_instance.patchSSOUser(ApiPatchSSOUserRequest(tenantId: tenantId, id: id, updateAPISSOUserData: updateAPISSOUserData, updateComments: updateComments));
+    final result = api_instance.patchSSOUser(tenantId, id, updateAPISSOUserData, ApiPatchSSOUserOptions(updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchSSOUser: $e\n');
@@ -4623,7 +4623,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putDomainConfig**
-> PutDomainConfigResponse putDomainConfig(ApiPutDomainConfigRequest)
+> PutDomainConfigResponse putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams, )
 
 
 
@@ -4641,7 +4641,7 @@ final domainToUpdate = domainToUpdate_example; // String |
 final updateDomainConfigParams = UpdateDomainConfigParams(); // UpdateDomainConfigParams | 
 
 try {
-    final result = api_instance.putDomainConfig(ApiPutDomainConfigRequest(tenantId: tenantId, domainToUpdate: domainToUpdate, updateDomainConfigParams: updateDomainConfigParams));
+    final result = api_instance.putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->putDomainConfig: $e\n');
@@ -4672,7 +4672,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putSSOUser**
-> PutSSOUserAPIResponse putSSOUser(ApiPutSSOUserRequest)
+> PutSSOUserAPIResponse putSSOUser(tenantId, id, updateAPISSOUserData, ApiPutSSOUserOptions options)
 
 
 
@@ -4691,7 +4691,7 @@ final updateAPISSOUserData = UpdateAPISSOUserData(); // UpdateAPISSOUserData |
 final updateComments = true; // bool | 
 
 try {
-    final result = api_instance.putSSOUser(ApiPutSSOUserRequest(tenantId: tenantId, id: id, updateAPISSOUserData: updateAPISSOUserData, updateComments: updateComments));
+    final result = api_instance.putSSOUser(tenantId, id, updateAPISSOUserData, ApiPutSSOUserOptions(updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->putSSOUser: $e\n');
@@ -4723,7 +4723,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **renderEmailTemplate**
-> RenderEmailTemplateResponse renderEmailTemplate(ApiRenderEmailTemplateRequest)
+> RenderEmailTemplateResponse renderEmailTemplate(tenantId, renderEmailTemplateBody, ApiRenderEmailTemplateOptions options)
 
 
 
@@ -4741,7 +4741,7 @@ final renderEmailTemplateBody = RenderEmailTemplateBody(); // RenderEmailTemplat
 final locale = locale_example; // String | 
 
 try {
-    final result = api_instance.renderEmailTemplate(ApiRenderEmailTemplateRequest(tenantId: tenantId, renderEmailTemplateBody: renderEmailTemplateBody, locale: locale));
+    final result = api_instance.renderEmailTemplate(tenantId, renderEmailTemplateBody, ApiRenderEmailTemplateOptions(locale: locale));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->renderEmailTemplate: $e\n');
@@ -4772,7 +4772,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **replaceTenantPackage**
-> APIEmptyResponse replaceTenantPackage(ApiReplaceTenantPackageRequest)
+> APIEmptyResponse replaceTenantPackage(tenantId, id, replaceTenantPackageBody, )
 
 
 
@@ -4790,7 +4790,7 @@ final id = id_example; // String |
 final replaceTenantPackageBody = ReplaceTenantPackageBody(); // ReplaceTenantPackageBody | 
 
 try {
-    final result = api_instance.replaceTenantPackage(ApiReplaceTenantPackageRequest(tenantId: tenantId, id: id, replaceTenantPackageBody: replaceTenantPackageBody));
+    final result = api_instance.replaceTenantPackage(tenantId, id, replaceTenantPackageBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->replaceTenantPackage: $e\n');
@@ -4821,7 +4821,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **replaceTenantUser**
-> APIEmptyResponse replaceTenantUser(ApiReplaceTenantUserRequest)
+> APIEmptyResponse replaceTenantUser(tenantId, id, replaceTenantUserBody, ApiReplaceTenantUserOptions options)
 
 
 
@@ -4840,7 +4840,7 @@ final replaceTenantUserBody = ReplaceTenantUserBody(); // ReplaceTenantUserBody
 final updateComments = updateComments_example; // String | 
 
 try {
-    final result = api_instance.replaceTenantUser(ApiReplaceTenantUserRequest(tenantId: tenantId, id: id, replaceTenantUserBody: replaceTenantUserBody, updateComments: updateComments));
+    final result = api_instance.replaceTenantUser(tenantId, id, replaceTenantUserBody, ApiReplaceTenantUserOptions(updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->replaceTenantUser: $e\n');
@@ -4872,7 +4872,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **saveComment**
-> APISaveCommentResponse saveComment(ApiSaveCommentRequest)
+> APISaveCommentResponse saveComment(tenantId, createCommentParams, ApiSaveCommentOptions options)
 
 
 
@@ -4893,7 +4893,7 @@ final sendEmails = true; // bool |
 final populateNotifications = true; // bool | 
 
 try {
-    final result = api_instance.saveComment(ApiSaveCommentRequest(tenantId: tenantId, createCommentParams: createCommentParams, isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
+    final result = api_instance.saveComment(tenantId, createCommentParams, ApiSaveCommentOptions(isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->saveComment: $e\n');
@@ -4927,7 +4927,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **saveCommentsBulk**
-> List<SaveCommentsBulkResponse> saveCommentsBulk(ApiSaveCommentsBulkRequest)
+> List<SaveCommentsBulkResponse> saveCommentsBulk(tenantId, createCommentParams, ApiSaveCommentsBulkOptions options)
 
 
 
@@ -4948,7 +4948,7 @@ final sendEmails = true; // bool |
 final populateNotifications = true; // bool | 
 
 try {
-    final result = api_instance.saveCommentsBulk(ApiSaveCommentsBulkRequest(tenantId: tenantId, createCommentParams: createCommentParams, isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
+    final result = api_instance.saveCommentsBulk(tenantId, createCommentParams, ApiSaveCommentsBulkOptions(isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->saveCommentsBulk: $e\n');
@@ -4982,7 +4982,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **sendInvite**
-> APIEmptyResponse sendInvite(ApiSendInviteRequest)
+> APIEmptyResponse sendInvite(tenantId, id, fromName, )
 
 
 
@@ -5000,7 +5000,7 @@ final id = id_example; // String |
 final fromName = fromName_example; // String | 
 
 try {
-    final result = api_instance.sendInvite(ApiSendInviteRequest(tenantId: tenantId, id: id, fromName: fromName));
+    final result = api_instance.sendInvite(tenantId, id, fromName, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->sendInvite: $e\n');
@@ -5031,7 +5031,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **sendLoginLink**
-> APIEmptyResponse sendLoginLink(ApiSendLoginLinkRequest)
+> APIEmptyResponse sendLoginLink(tenantId, id, ApiSendLoginLinkOptions options)
 
 
 
@@ -5049,7 +5049,7 @@ final id = id_example; // String |
 final redirectURL = redirectURL_example; // String | 
 
 try {
-    final result = api_instance.sendLoginLink(ApiSendLoginLinkRequest(tenantId: tenantId, id: id, redirectURL: redirectURL));
+    final result = api_instance.sendLoginLink(tenantId, id, ApiSendLoginLinkOptions(redirectURL: redirectURL));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->sendLoginLink: $e\n');
@@ -5080,7 +5080,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unBlockUserFromComment**
-> UnblockSuccess unBlockUserFromComment(ApiUnBlockUserFromCommentRequest)
+> UnblockSuccess unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, ApiUnBlockUserFromCommentOptions options)
 
 
 
@@ -5100,7 +5100,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.unBlockUserFromComment(ApiUnBlockUserFromCommentRequest(tenantId: tenantId, id: id, unBlockFromCommentParams: unBlockFromCommentParams, userId: userId, anonUserId: anonUserId));
+    final result = api_instance.unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, ApiUnBlockUserFromCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->unBlockUserFromComment: $e\n');
@@ -5133,7 +5133,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unFlagComment**
-> FlagCommentResponse unFlagComment(ApiUnFlagCommentRequest)
+> FlagCommentResponse unFlagComment(tenantId, id, ApiUnFlagCommentOptions options)
 
 
 
@@ -5152,7 +5152,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.unFlagComment(ApiUnFlagCommentRequest(tenantId: tenantId, id: id, userId: userId, anonUserId: anonUserId));
+    final result = api_instance.unFlagComment(tenantId, id, ApiUnFlagCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->unFlagComment: $e\n');
@@ -5184,7 +5184,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateComment**
-> APIEmptyResponse updateComment(ApiUpdateCommentRequest)
+> APIEmptyResponse updateComment(tenantId, id, updatableCommentParams, ApiUpdateCommentOptions options)
 
 
 
@@ -5205,7 +5205,7 @@ final doSpamCheck = true; // bool |
 final isLive = true; // bool | 
 
 try {
-    final result = api_instance.updateComment(ApiUpdateCommentRequest(tenantId: tenantId, id: id, updatableCommentParams: updatableCommentParams, contextUserId: contextUserId, doSpamCheck: doSpamCheck, isLive: isLive));
+    final result = api_instance.updateComment(tenantId, id, updatableCommentParams, ApiUpdateCommentOptions(contextUserId: contextUserId, doSpamCheck: doSpamCheck, isLive: isLive));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateComment: $e\n');
@@ -5239,7 +5239,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateEmailTemplate**
-> APIEmptyResponse updateEmailTemplate(ApiUpdateEmailTemplateRequest)
+> APIEmptyResponse updateEmailTemplate(tenantId, id, updateEmailTemplateBody, )
 
 
 
@@ -5257,7 +5257,7 @@ final id = id_example; // String |
 final updateEmailTemplateBody = UpdateEmailTemplateBody(); // UpdateEmailTemplateBody | 
 
 try {
-    final result = api_instance.updateEmailTemplate(ApiUpdateEmailTemplateRequest(tenantId: tenantId, id: id, updateEmailTemplateBody: updateEmailTemplateBody));
+    final result = api_instance.updateEmailTemplate(tenantId, id, updateEmailTemplateBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateEmailTemplate: $e\n');
@@ -5288,7 +5288,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateFeedPost**
-> APIEmptyResponse updateFeedPost(ApiUpdateFeedPostRequest)
+> APIEmptyResponse updateFeedPost(tenantId, id, feedPost, )
 
 
 
@@ -5306,7 +5306,7 @@ final id = id_example; // String |
 final feedPost = FeedPost(); // FeedPost | 
 
 try {
-    final result = api_instance.updateFeedPost(ApiUpdateFeedPostRequest(tenantId: tenantId, id: id, feedPost: feedPost));
+    final result = api_instance.updateFeedPost(tenantId, id, feedPost, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateFeedPost: $e\n');
@@ -5337,7 +5337,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateModerator**
-> APIEmptyResponse updateModerator(ApiUpdateModeratorRequest)
+> APIEmptyResponse updateModerator(tenantId, id, updateModeratorBody, )
 
 
 
@@ -5355,7 +5355,7 @@ final id = id_example; // String |
 final updateModeratorBody = UpdateModeratorBody(); // UpdateModeratorBody | 
 
 try {
-    final result = api_instance.updateModerator(ApiUpdateModeratorRequest(tenantId: tenantId, id: id, updateModeratorBody: updateModeratorBody));
+    final result = api_instance.updateModerator(tenantId, id, updateModeratorBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateModerator: $e\n');
@@ -5386,7 +5386,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateNotification**
-> APIEmptyResponse updateNotification(ApiUpdateNotificationRequest)
+> APIEmptyResponse updateNotification(tenantId, id, updateNotificationBody, ApiUpdateNotificationOptions options)
 
 
 
@@ -5405,7 +5405,7 @@ final updateNotificationBody = UpdateNotificationBody(); // UpdateNotificationBo
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.updateNotification(ApiUpdateNotificationRequest(tenantId: tenantId, id: id, updateNotificationBody: updateNotificationBody, userId: userId));
+    final result = api_instance.updateNotification(tenantId, id, updateNotificationBody, ApiUpdateNotificationOptions(userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateNotification: $e\n');
@@ -5437,7 +5437,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateQuestionConfig**
-> APIEmptyResponse updateQuestionConfig(ApiUpdateQuestionConfigRequest)
+> APIEmptyResponse updateQuestionConfig(tenantId, id, updateQuestionConfigBody, )
 
 
 
@@ -5455,7 +5455,7 @@ final id = id_example; // String |
 final updateQuestionConfigBody = UpdateQuestionConfigBody(); // UpdateQuestionConfigBody | 
 
 try {
-    final result = api_instance.updateQuestionConfig(ApiUpdateQuestionConfigRequest(tenantId: tenantId, id: id, updateQuestionConfigBody: updateQuestionConfigBody));
+    final result = api_instance.updateQuestionConfig(tenantId, id, updateQuestionConfigBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateQuestionConfig: $e\n');
@@ -5486,7 +5486,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateQuestionResult**
-> APIEmptyResponse updateQuestionResult(ApiUpdateQuestionResultRequest)
+> APIEmptyResponse updateQuestionResult(tenantId, id, updateQuestionResultBody, )
 
 
 
@@ -5504,7 +5504,7 @@ final id = id_example; // String |
 final updateQuestionResultBody = UpdateQuestionResultBody(); // UpdateQuestionResultBody | 
 
 try {
-    final result = api_instance.updateQuestionResult(ApiUpdateQuestionResultRequest(tenantId: tenantId, id: id, updateQuestionResultBody: updateQuestionResultBody));
+    final result = api_instance.updateQuestionResult(tenantId, id, updateQuestionResultBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateQuestionResult: $e\n');
@@ -5535,7 +5535,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateSubscription**
-> UpdateSubscriptionAPIResponse updateSubscription(ApiUpdateSubscriptionRequest)
+> UpdateSubscriptionAPIResponse updateSubscription(tenantId, id, updateAPIUserSubscriptionData, ApiUpdateSubscriptionOptions options)
 
 
 
@@ -5554,7 +5554,7 @@ final updateAPIUserSubscriptionData = UpdateAPIUserSubscriptionData(); // Update
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.updateSubscription(ApiUpdateSubscriptionRequest(tenantId: tenantId, id: id, updateAPIUserSubscriptionData: updateAPIUserSubscriptionData, userId: userId));
+    final result = api_instance.updateSubscription(tenantId, id, updateAPIUserSubscriptionData, ApiUpdateSubscriptionOptions(userId: userId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateSubscription: $e\n');
@@ -5586,7 +5586,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenant**
-> APIEmptyResponse updateTenant(ApiUpdateTenantRequest)
+> APIEmptyResponse updateTenant(tenantId, id, updateTenantBody, )
 
 
 
@@ -5604,7 +5604,7 @@ final id = id_example; // String |
 final updateTenantBody = UpdateTenantBody(); // UpdateTenantBody | 
 
 try {
-    final result = api_instance.updateTenant(ApiUpdateTenantRequest(tenantId: tenantId, id: id, updateTenantBody: updateTenantBody));
+    final result = api_instance.updateTenant(tenantId, id, updateTenantBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenant: $e\n');
@@ -5635,7 +5635,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenantPackage**
-> APIEmptyResponse updateTenantPackage(ApiUpdateTenantPackageRequest)
+> APIEmptyResponse updateTenantPackage(tenantId, id, updateTenantPackageBody, )
 
 
 
@@ -5653,7 +5653,7 @@ final id = id_example; // String |
 final updateTenantPackageBody = UpdateTenantPackageBody(); // UpdateTenantPackageBody | 
 
 try {
-    final result = api_instance.updateTenantPackage(ApiUpdateTenantPackageRequest(tenantId: tenantId, id: id, updateTenantPackageBody: updateTenantPackageBody));
+    final result = api_instance.updateTenantPackage(tenantId, id, updateTenantPackageBody, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenantPackage: $e\n');
@@ -5684,7 +5684,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenantUser**
-> APIEmptyResponse updateTenantUser(ApiUpdateTenantUserRequest)
+> APIEmptyResponse updateTenantUser(tenantId, id, updateTenantUserBody, ApiUpdateTenantUserOptions options)
 
 
 
@@ -5703,7 +5703,7 @@ final updateTenantUserBody = UpdateTenantUserBody(); // UpdateTenantUserBody |
 final updateComments = updateComments_example; // String | 
 
 try {
-    final result = api_instance.updateTenantUser(ApiUpdateTenantUserRequest(tenantId: tenantId, id: id, updateTenantUserBody: updateTenantUserBody, updateComments: updateComments));
+    final result = api_instance.updateTenantUser(tenantId, id, updateTenantUserBody, ApiUpdateTenantUserOptions(updateComments: updateComments));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenantUser: $e\n');
@@ -5735,7 +5735,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserBadge**
-> APIEmptySuccessResponse updateUserBadge(ApiUpdateUserBadgeRequest)
+> APIEmptySuccessResponse updateUserBadge(tenantId, id, updateUserBadgeParams, )
 
 
 
@@ -5753,7 +5753,7 @@ final id = id_example; // String |
 final updateUserBadgeParams = UpdateUserBadgeParams(); // UpdateUserBadgeParams | 
 
 try {
-    final result = api_instance.updateUserBadge(ApiUpdateUserBadgeRequest(tenantId: tenantId, id: id, updateUserBadgeParams: updateUserBadgeParams));
+    final result = api_instance.updateUserBadge(tenantId, id, updateUserBadgeParams, );
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateUserBadge: $e\n');
diff --git a/client/doc/ModerationApi.md b/client/doc/ModerationApi.md
index 9b18940..7e79c04 100644
--- a/client/doc/ModerationApi.md
+++ b/client/doc/ModerationApi.md
@@ -55,7 +55,7 @@ Method | HTTP request | Description
 
 
 # **deleteModerationVote**
-> VoteDeleteResponse deleteModerationVote(ApiDeleteModerationVoteRequest)
+> VoteDeleteResponse deleteModerationVote(commentId, voteId, ApiDeleteModerationVoteOptions options)
 
 
 
@@ -71,7 +71,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteModerationVote(ApiDeleteModerationVoteRequest(commentId: commentId, voteId: voteId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.deleteModerationVote(commentId, voteId, ApiDeleteModerationVoteOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->deleteModerationVote: $e\n');
@@ -104,7 +104,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiComments**
-> ModerationAPIGetCommentsResponse getApiComments(ApiGetApiCommentsRequest)
+> ModerationAPIGetCommentsResponse getApiComments(ApiGetApiCommentsOptions options)
 
 
 
@@ -125,7 +125,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiComments(ApiGetApiCommentsRequest(page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, tenantId: tenantId, sso: sso));
+    final result = api_instance.getApiComments(ApiGetApiCommentsOptions(page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiComments: $e\n');
@@ -163,7 +163,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiExportStatus**
-> ModerationExportStatusResponse getApiExportStatus(ApiGetApiExportStatusRequest)
+> ModerationExportStatusResponse getApiExportStatus(ApiGetApiExportStatusOptions options)
 
 
 
@@ -177,7 +177,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiExportStatus(ApiGetApiExportStatusRequest(batchJobId: batchJobId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getApiExportStatus(ApiGetApiExportStatusOptions(batchJobId: batchJobId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiExportStatus: $e\n');
@@ -208,7 +208,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiIds**
-> ModerationAPIGetCommentIdsResponse getApiIds(ApiGetApiIdsRequest)
+> ModerationAPIGetCommentIdsResponse getApiIds(ApiGetApiIdsOptions options)
 
 
 
@@ -227,7 +227,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiIds(ApiGetApiIdsRequest(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, tenantId: tenantId, sso: sso));
+    final result = api_instance.getApiIds(ApiGetApiIdsOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiIds: $e\n');
@@ -263,7 +263,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getBanUsersFromComment**
-> GetBannedUsersFromCommentResponse getBanUsersFromComment(ApiGetBanUsersFromCommentRequest)
+> GetBannedUsersFromCommentResponse getBanUsersFromComment(commentId, ApiGetBanUsersFromCommentOptions options)
 
 
 
@@ -277,7 +277,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getBanUsersFromComment(ApiGetBanUsersFromCommentRequest(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getBanUsersFromComment(commentId, ApiGetBanUsersFromCommentOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getBanUsersFromComment: $e\n');
@@ -308,7 +308,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentBanStatus**
-> GetCommentBanStatusResponse getCommentBanStatus(ApiGetCommentBanStatusRequest)
+> GetCommentBanStatusResponse getCommentBanStatus(commentId, ApiGetCommentBanStatusOptions options)
 
 
 
@@ -322,7 +322,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentBanStatus(ApiGetCommentBanStatusRequest(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getCommentBanStatus(commentId, ApiGetCommentBanStatusOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentBanStatus: $e\n');
@@ -353,7 +353,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentChildren**
-> ModerationAPIChildCommentsResponse getCommentChildren(ApiGetCommentChildrenRequest)
+> ModerationAPIChildCommentsResponse getCommentChildren(commentId, ApiGetCommentChildrenOptions options)
 
 
 
@@ -367,7 +367,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentChildren(ApiGetCommentChildrenRequest(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getCommentChildren(commentId, ApiGetCommentChildrenOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentChildren: $e\n');
@@ -398,7 +398,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCount**
-> ModerationAPICountCommentsResponse getCount(ApiGetCountRequest)
+> ModerationAPICountCommentsResponse getCount(ApiGetCountOptions options)
 
 
 
@@ -416,7 +416,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCount(ApiGetCountRequest(textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, tenantId: tenantId, sso: sso));
+    final result = api_instance.getCount(ApiGetCountOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCount: $e\n');
@@ -451,7 +451,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCounts**
-> GetBannedUsersCountResponse getCounts(ApiGetCountsRequest)
+> GetBannedUsersCountResponse getCounts(ApiGetCountsOptions options)
 
 
 
@@ -464,7 +464,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCounts(ApiGetCountsRequest(tenantId: tenantId, sso: sso));
+    final result = api_instance.getCounts(ApiGetCountsOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCounts: $e\n');
@@ -494,7 +494,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getLogs**
-> ModerationAPIGetLogsResponse getLogs(ApiGetLogsRequest)
+> ModerationAPIGetLogsResponse getLogs(commentId, ApiGetLogsOptions options)
 
 
 
@@ -508,7 +508,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getLogs(ApiGetLogsRequest(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getLogs(commentId, ApiGetLogsOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getLogs: $e\n');
@@ -539,7 +539,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadges**
-> GetTenantManualBadgesResponse getManualBadges(ApiGetManualBadgesRequest)
+> GetTenantManualBadgesResponse getManualBadges(ApiGetManualBadgesOptions options)
 
 
 
@@ -552,7 +552,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadges(ApiGetManualBadgesRequest(tenantId: tenantId, sso: sso));
+    final result = api_instance.getManualBadges(ApiGetManualBadgesOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadges: $e\n');
@@ -582,7 +582,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadgesForUser**
-> GetUserManualBadgesResponse getManualBadgesForUser(ApiGetManualBadgesForUserRequest)
+> GetUserManualBadgesResponse getManualBadgesForUser(ApiGetManualBadgesForUserOptions options)
 
 
 
@@ -597,7 +597,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadgesForUser(ApiGetManualBadgesForUserRequest(badgesUserId: badgesUserId, commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getManualBadgesForUser(ApiGetManualBadgesForUserOptions(badgesUserId: badgesUserId, commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadgesForUser: $e\n');
@@ -629,7 +629,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationComment**
-> ModerationAPICommentResponse getModerationComment(ApiGetModerationCommentRequest)
+> ModerationAPICommentResponse getModerationComment(commentId, ApiGetModerationCommentOptions options)
 
 
 
@@ -645,7 +645,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationComment(ApiGetModerationCommentRequest(commentId: commentId, includeEmail: includeEmail, includeIP: includeIP, tenantId: tenantId, sso: sso));
+    final result = api_instance.getModerationComment(commentId, ApiGetModerationCommentOptions(includeEmail: includeEmail, includeIP: includeIP, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationComment: $e\n');
@@ -678,7 +678,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationCommentText**
-> GetCommentTextResponse getModerationCommentText(ApiGetModerationCommentTextRequest)
+> GetCommentTextResponse getModerationCommentText(commentId, ApiGetModerationCommentTextOptions options)
 
 
 
@@ -692,7 +692,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationCommentText(ApiGetModerationCommentTextRequest(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getModerationCommentText(commentId, ApiGetModerationCommentTextOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationCommentText: $e\n');
@@ -723,7 +723,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPreBanSummary**
-> PreBanSummary getPreBanSummary(ApiGetPreBanSummaryRequest)
+> PreBanSummary getPreBanSummary(commentId, ApiGetPreBanSummaryOptions options)
 
 
 
@@ -740,7 +740,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getPreBanSummary(ApiGetPreBanSummaryRequest(commentId: commentId, includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
+    final result = api_instance.getPreBanSummary(commentId, ApiGetPreBanSummaryOptions(includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getPreBanSummary: $e\n');
@@ -774,7 +774,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchCommentsSummary**
-> ModerationCommentSearchResponse getSearchCommentsSummary(ApiGetSearchCommentsSummaryRequest)
+> ModerationCommentSearchResponse getSearchCommentsSummary(ApiGetSearchCommentsSummaryOptions options)
 
 
 
@@ -790,7 +790,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchCommentsSummary(ApiGetSearchCommentsSummaryRequest(value: value, filters: filters, searchFilters: searchFilters, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchCommentsSummary(ApiGetSearchCommentsSummaryOptions(value: value, filters: filters, searchFilters: searchFilters, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchCommentsSummary: $e\n');
@@ -823,7 +823,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchPages**
-> ModerationPageSearchResponse getSearchPages(ApiGetSearchPagesRequest)
+> ModerationPageSearchResponse getSearchPages(ApiGetSearchPagesOptions options)
 
 
 
@@ -837,7 +837,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchPages(ApiGetSearchPagesRequest(value: value, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchPages(ApiGetSearchPagesOptions(value: value, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchPages: $e\n');
@@ -868,7 +868,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSites**
-> ModerationSiteSearchResponse getSearchSites(ApiGetSearchSitesRequest)
+> ModerationSiteSearchResponse getSearchSites(ApiGetSearchSitesOptions options)
 
 
 
@@ -882,7 +882,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSites(ApiGetSearchSitesRequest(value: value, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchSites(ApiGetSearchSitesOptions(value: value, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSites: $e\n');
@@ -913,7 +913,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSuggest**
-> ModerationSuggestResponse getSearchSuggest(ApiGetSearchSuggestRequest)
+> ModerationSuggestResponse getSearchSuggest(ApiGetSearchSuggestOptions options)
 
 
 
@@ -927,7 +927,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSuggest(ApiGetSearchSuggestRequest(textSearch: textSearch, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchSuggest(ApiGetSearchSuggestOptions(textSearch: textSearch, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSuggest: $e\n');
@@ -958,7 +958,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchUsers**
-> ModerationUserSearchResponse getSearchUsers(ApiGetSearchUsersRequest)
+> ModerationUserSearchResponse getSearchUsers(ApiGetSearchUsersOptions options)
 
 
 
@@ -972,7 +972,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchUsers(ApiGetSearchUsersRequest(value: value, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchUsers(ApiGetSearchUsersOptions(value: value, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchUsers: $e\n');
@@ -1003,7 +1003,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTrustFactor**
-> GetUserTrustFactorResponse getTrustFactor(ApiGetTrustFactorRequest)
+> GetUserTrustFactorResponse getTrustFactor(ApiGetTrustFactorOptions options)
 
 
 
@@ -1017,7 +1017,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getTrustFactor(ApiGetTrustFactorRequest(userId: userId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getTrustFactor(ApiGetTrustFactorOptions(userId: userId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getTrustFactor: $e\n');
@@ -1048,7 +1048,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBanPreference**
-> APIModerateGetUserBanPreferencesResponse getUserBanPreference(ApiGetUserBanPreferenceRequest)
+> APIModerateGetUserBanPreferencesResponse getUserBanPreference(ApiGetUserBanPreferenceOptions options)
 
 
 
@@ -1061,7 +1061,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserBanPreference(ApiGetUserBanPreferenceRequest(tenantId: tenantId, sso: sso));
+    final result = api_instance.getUserBanPreference(ApiGetUserBanPreferenceOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserBanPreference: $e\n');
@@ -1091,7 +1091,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserInternalProfile**
-> GetUserInternalProfileResponse getUserInternalProfile(ApiGetUserInternalProfileRequest)
+> GetUserInternalProfileResponse getUserInternalProfile(ApiGetUserInternalProfileOptions options)
 
 
 
@@ -1105,7 +1105,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserInternalProfile(ApiGetUserInternalProfileRequest(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getUserInternalProfile(ApiGetUserInternalProfileOptions(commentId: commentId, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserInternalProfile: $e\n');
@@ -1136,7 +1136,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postAdjustCommentVotes**
-> AdjustVotesResponse postAdjustCommentVotes(ApiPostAdjustCommentVotesRequest)
+> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, ApiPostAdjustCommentVotesOptions options)
 
 
 
@@ -1152,7 +1152,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postAdjustCommentVotes(ApiPostAdjustCommentVotesRequest(commentId: commentId, adjustCommentVotesParams: adjustCommentVotesParams, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, ApiPostAdjustCommentVotesOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postAdjustCommentVotes: $e\n');
@@ -1185,7 +1185,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postApiExport**
-> ModerationExportResponse postApiExport(ApiPostApiExportRequest)
+> ModerationExportResponse postApiExport(ApiPostApiExportOptions options)
 
 
 
@@ -1203,7 +1203,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postApiExport(ApiPostApiExportRequest(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, tenantId: tenantId, sso: sso));
+    final result = api_instance.postApiExport(ApiPostApiExportOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postApiExport: $e\n');
@@ -1238,7 +1238,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserFromComment**
-> BanUserFromCommentResult postBanUserFromComment(ApiPostBanUserFromCommentRequest)
+> BanUserFromCommentResult postBanUserFromComment(commentId, ApiPostBanUserFromCommentOptions options)
 
 
 
@@ -1260,7 +1260,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserFromComment(ApiPostBanUserFromCommentRequest(commentId: commentId, banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, tenantId: tenantId, sso: sso));
+    final result = api_instance.postBanUserFromComment(commentId, ApiPostBanUserFromCommentOptions(banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserFromComment: $e\n');
@@ -1299,7 +1299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserUndo**
-> APIEmptyResponse postBanUserUndo(ApiPostBanUserUndoRequest)
+> APIEmptyResponse postBanUserUndo(banUserUndoParams, ApiPostBanUserUndoOptions options)
 
 
 
@@ -1313,7 +1313,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserUndo(ApiPostBanUserUndoRequest(banUserUndoParams: banUserUndoParams, tenantId: tenantId, sso: sso));
+    final result = api_instance.postBanUserUndo(banUserUndoParams, ApiPostBanUserUndoOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserUndo: $e\n');
@@ -1344,7 +1344,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBulkPreBanSummary**
-> BulkPreBanSummary postBulkPreBanSummary(ApiPostBulkPreBanSummaryRequest)
+> BulkPreBanSummary postBulkPreBanSummary(bulkPreBanParams, ApiPostBulkPreBanSummaryOptions options)
 
 
 
@@ -1361,7 +1361,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBulkPreBanSummary(ApiPostBulkPreBanSummaryRequest(bulkPreBanParams: bulkPreBanParams, includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
+    final result = api_instance.postBulkPreBanSummary(bulkPreBanParams, ApiPostBulkPreBanSummaryOptions(includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBulkPreBanSummary: $e\n');
@@ -1395,7 +1395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postCommentsByIds**
-> ModerationAPIChildCommentsResponse postCommentsByIds(ApiPostCommentsByIdsRequest)
+> ModerationAPIChildCommentsResponse postCommentsByIds(commentsByIdsParams, ApiPostCommentsByIdsOptions options)
 
 
 
@@ -1409,7 +1409,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postCommentsByIds(ApiPostCommentsByIdsRequest(commentsByIdsParams: commentsByIdsParams, tenantId: tenantId, sso: sso));
+    final result = api_instance.postCommentsByIds(commentsByIdsParams, ApiPostCommentsByIdsOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postCommentsByIds: $e\n');
@@ -1440,7 +1440,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postFlagComment**
-> APIEmptyResponse postFlagComment(ApiPostFlagCommentRequest)
+> APIEmptyResponse postFlagComment(commentId, ApiPostFlagCommentOptions options)
 
 
 
@@ -1455,7 +1455,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postFlagComment(ApiPostFlagCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postFlagComment(commentId, ApiPostFlagCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postFlagComment: $e\n');
@@ -1487,7 +1487,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRemoveComment**
-> PostRemoveCommentResponse postRemoveComment(ApiPostRemoveCommentRequest)
+> PostRemoveCommentResponse postRemoveComment(commentId, ApiPostRemoveCommentOptions options)
 
 
 
@@ -1502,7 +1502,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRemoveComment(ApiPostRemoveCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postRemoveComment(commentId, ApiPostRemoveCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRemoveComment: $e\n');
@@ -1534,7 +1534,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRestoreDeletedComment**
-> APIEmptyResponse postRestoreDeletedComment(ApiPostRestoreDeletedCommentRequest)
+> APIEmptyResponse postRestoreDeletedComment(commentId, ApiPostRestoreDeletedCommentOptions options)
 
 
 
@@ -1549,7 +1549,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRestoreDeletedComment(ApiPostRestoreDeletedCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postRestoreDeletedComment(commentId, ApiPostRestoreDeletedCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRestoreDeletedComment: $e\n');
@@ -1581,7 +1581,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentApprovalStatus**
-> SetCommentApprovedResponse postSetCommentApprovalStatus(ApiPostSetCommentApprovalStatusRequest)
+> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, ApiPostSetCommentApprovalStatusOptions options)
 
 
 
@@ -1597,7 +1597,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentApprovalStatus(ApiPostSetCommentApprovalStatusRequest(commentId: commentId, approved: approved, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentApprovalStatus(commentId, ApiPostSetCommentApprovalStatusOptions(approved: approved, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentApprovalStatus: $e\n');
@@ -1630,7 +1630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentReviewStatus**
-> APIEmptyResponse postSetCommentReviewStatus(ApiPostSetCommentReviewStatusRequest)
+> APIEmptyResponse postSetCommentReviewStatus(commentId, ApiPostSetCommentReviewStatusOptions options)
 
 
 
@@ -1646,7 +1646,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentReviewStatus(ApiPostSetCommentReviewStatusRequest(commentId: commentId, reviewed: reviewed, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentReviewStatus(commentId, ApiPostSetCommentReviewStatusOptions(reviewed: reviewed, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentReviewStatus: $e\n');
@@ -1679,7 +1679,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentSpamStatus**
-> APIEmptyResponse postSetCommentSpamStatus(ApiPostSetCommentSpamStatusRequest)
+> APIEmptyResponse postSetCommentSpamStatus(commentId, ApiPostSetCommentSpamStatusOptions options)
 
 
 
@@ -1696,7 +1696,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentSpamStatus(ApiPostSetCommentSpamStatusRequest(commentId: commentId, spam: spam, permNotSpam: permNotSpam, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentSpamStatus(commentId, ApiPostSetCommentSpamStatusOptions(spam: spam, permNotSpam: permNotSpam, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentSpamStatus: $e\n');
@@ -1730,7 +1730,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentText**
-> SetCommentTextResponse postSetCommentText(ApiPostSetCommentTextRequest)
+> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, ApiPostSetCommentTextOptions options)
 
 
 
@@ -1746,7 +1746,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentText(ApiPostSetCommentTextRequest(commentId: commentId, setCommentTextParams: setCommentTextParams, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, ApiPostSetCommentTextOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentText: $e\n');
@@ -1779,7 +1779,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postUnFlagComment**
-> APIEmptyResponse postUnFlagComment(ApiPostUnFlagCommentRequest)
+> APIEmptyResponse postUnFlagComment(commentId, ApiPostUnFlagCommentOptions options)
 
 
 
@@ -1794,7 +1794,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postUnFlagComment(ApiPostUnFlagCommentRequest(commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postUnFlagComment(commentId, ApiPostUnFlagCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postUnFlagComment: $e\n');
@@ -1826,7 +1826,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postVote**
-> VoteResponse postVote(ApiPostVoteRequest)
+> VoteResponse postVote(commentId, ApiPostVoteOptions options)
 
 
 
@@ -1842,7 +1842,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postVote(ApiPostVoteRequest(commentId: commentId, direction: direction, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postVote(commentId, ApiPostVoteOptions(direction: direction, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postVote: $e\n');
@@ -1875,7 +1875,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putAwardBadge**
-> AwardUserBadgeResponse putAwardBadge(ApiPutAwardBadgeRequest)
+> AwardUserBadgeResponse putAwardBadge(badgeId, ApiPutAwardBadgeOptions options)
 
 
 
@@ -1892,7 +1892,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putAwardBadge(ApiPutAwardBadgeRequest(badgeId: badgeId, userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.putAwardBadge(badgeId, ApiPutAwardBadgeOptions(userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putAwardBadge: $e\n');
@@ -1926,7 +1926,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putCloseThread**
-> APIEmptyResponse putCloseThread(ApiPutCloseThreadRequest)
+> APIEmptyResponse putCloseThread(urlId, ApiPutCloseThreadOptions options)
 
 
 
@@ -1940,7 +1940,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putCloseThread(ApiPutCloseThreadRequest(urlId: urlId, tenantId: tenantId, sso: sso));
+    final result = api_instance.putCloseThread(urlId, ApiPutCloseThreadOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putCloseThread: $e\n');
@@ -1971,7 +1971,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putRemoveBadge**
-> RemoveUserBadgeResponse putRemoveBadge(ApiPutRemoveBadgeRequest)
+> RemoveUserBadgeResponse putRemoveBadge(badgeId, ApiPutRemoveBadgeOptions options)
 
 
 
@@ -1988,7 +1988,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putRemoveBadge(ApiPutRemoveBadgeRequest(badgeId: badgeId, userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.putRemoveBadge(badgeId, ApiPutRemoveBadgeOptions(userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putRemoveBadge: $e\n');
@@ -2022,7 +2022,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putReopenThread**
-> APIEmptyResponse putReopenThread(ApiPutReopenThreadRequest)
+> APIEmptyResponse putReopenThread(urlId, ApiPutReopenThreadOptions options)
 
 
 
@@ -2036,7 +2036,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putReopenThread(ApiPutReopenThreadRequest(urlId: urlId, tenantId: tenantId, sso: sso));
+    final result = api_instance.putReopenThread(urlId, ApiPutReopenThreadOptions(tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putReopenThread: $e\n');
@@ -2067,7 +2067,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setTrustFactor**
-> SetUserTrustFactorResponse setTrustFactor(ApiSetTrustFactorRequest)
+> SetUserTrustFactorResponse setTrustFactor(ApiSetTrustFactorOptions options)
 
 
 
@@ -2082,7 +2082,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setTrustFactor(ApiSetTrustFactorRequest(userId: userId, trustFactor: trustFactor, tenantId: tenantId, sso: sso));
+    final result = api_instance.setTrustFactor(ApiSetTrustFactorOptions(userId: userId, trustFactor: trustFactor, tenantId: tenantId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->setTrustFactor: $e\n');
diff --git a/client/doc/PublicApi.md b/client/doc/PublicApi.md
index 2507a80..b297dfd 100644
--- a/client/doc/PublicApi.md
+++ b/client/doc/PublicApi.md
@@ -64,7 +64,7 @@ Method | HTTP request | Description
 
 
 # **blockFromCommentPublic**
-> BlockSuccess blockFromCommentPublic(ApiBlockFromCommentPublicRequest)
+> BlockSuccess blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiBlockFromCommentPublicOptions options)
 
 
 
@@ -79,7 +79,7 @@ final publicBlockFromCommentParams = PublicBlockFromCommentParams(); // PublicBl
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.blockFromCommentPublic(ApiBlockFromCommentPublicRequest(tenantId: tenantId, commentId: commentId, publicBlockFromCommentParams: publicBlockFromCommentParams, sso: sso));
+    final result = api_instance.blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiBlockFromCommentPublicOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->blockFromCommentPublic: $e\n');
@@ -111,7 +111,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **checkedCommentsForBlocked**
-> CheckBlockedCommentsResponse checkedCommentsForBlocked(ApiCheckedCommentsForBlockedRequest)
+> CheckBlockedCommentsResponse checkedCommentsForBlocked(tenantId, commentIds, ApiCheckedCommentsForBlockedOptions options)
 
 
 
@@ -125,7 +125,7 @@ final commentIds = commentIds_example; // String | A comma separated list of com
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.checkedCommentsForBlocked(ApiCheckedCommentsForBlockedRequest(tenantId: tenantId, commentIds: commentIds, sso: sso));
+    final result = api_instance.checkedCommentsForBlocked(tenantId, commentIds, ApiCheckedCommentsForBlockedOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->checkedCommentsForBlocked: $e\n');
@@ -156,7 +156,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createCommentPublic**
-> SaveCommentsResponseWithPresence createCommentPublic(ApiCreateCommentPublicRequest)
+> SaveCommentsResponseWithPresence createCommentPublic(tenantId, urlId, broadcastId, commentData, ApiCreateCommentPublicOptions options)
 
 
 
@@ -173,7 +173,7 @@ final sessionId = sessionId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.createCommentPublic(ApiCreateCommentPublicRequest(tenantId: tenantId, urlId: urlId, broadcastId: broadcastId, commentData: commentData, sessionId: sessionId, sso: sso));
+    final result = api_instance.createCommentPublic(tenantId, urlId, broadcastId, commentData, ApiCreateCommentPublicOptions(sessionId: sessionId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createCommentPublic: $e\n');
@@ -207,7 +207,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createFeedPostPublic**
-> CreateFeedPostResponse createFeedPostPublic(ApiCreateFeedPostPublicRequest)
+> CreateFeedPostResponse createFeedPostPublic(tenantId, createFeedPostParams, ApiCreateFeedPostPublicOptions options)
 
 
 
@@ -222,7 +222,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.createFeedPostPublic(ApiCreateFeedPostPublicRequest(tenantId: tenantId, createFeedPostParams: createFeedPostParams, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.createFeedPostPublic(tenantId, createFeedPostParams, ApiCreateFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createFeedPostPublic: $e\n');
@@ -254,7 +254,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createV1PageReact**
-> CreateV1PageReact createV1PageReact(ApiCreateV1PageReactRequest)
+> CreateV1PageReact createV1PageReact(tenantId, urlId, ApiCreateV1PageReactOptions options)
 
 
 
@@ -268,7 +268,7 @@ final urlId = urlId_example; // String |
 final title = title_example; // String | 
 
 try {
-    final result = api_instance.createV1PageReact(ApiCreateV1PageReactRequest(tenantId: tenantId, urlId: urlId, title: title));
+    final result = api_instance.createV1PageReact(tenantId, urlId, ApiCreateV1PageReactOptions(title: title));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createV1PageReact: $e\n');
@@ -299,7 +299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createV2PageReact**
-> CreateV1PageReact createV2PageReact(ApiCreateV2PageReactRequest)
+> CreateV1PageReact createV2PageReact(tenantId, urlId, id, ApiCreateV2PageReactOptions options)
 
 
 
@@ -314,7 +314,7 @@ final id = id_example; // String |
 final title = title_example; // String | 
 
 try {
-    final result = api_instance.createV2PageReact(ApiCreateV2PageReactRequest(tenantId: tenantId, urlId: urlId, id: id, title: title));
+    final result = api_instance.createV2PageReact(tenantId, urlId, id, ApiCreateV2PageReactOptions(title: title));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createV2PageReact: $e\n');
@@ -346,7 +346,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteCommentPublic**
-> PublicAPIDeleteCommentResponse deleteCommentPublic(ApiDeleteCommentPublicRequest)
+> PublicAPIDeleteCommentResponse deleteCommentPublic(tenantId, commentId, broadcastId, ApiDeleteCommentPublicOptions options)
 
 
 
@@ -362,7 +362,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteCommentPublic(ApiDeleteCommentPublicRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, editKey: editKey, sso: sso));
+    final result = api_instance.deleteCommentPublic(tenantId, commentId, broadcastId, ApiDeleteCommentPublicOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteCommentPublic: $e\n');
@@ -395,7 +395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteCommentVote**
-> VoteDeleteResponse deleteCommentVote(ApiDeleteCommentVoteRequest)
+> VoteDeleteResponse deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, ApiDeleteCommentVoteOptions options)
 
 
 
@@ -413,7 +413,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteCommentVote(ApiDeleteCommentVoteRequest(tenantId: tenantId, commentId: commentId, voteId: voteId, urlId: urlId, broadcastId: broadcastId, editKey: editKey, sso: sso));
+    final result = api_instance.deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, ApiDeleteCommentVoteOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteCommentVote: $e\n');
@@ -448,7 +448,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteFeedPostPublic**
-> DeleteFeedPostPublicResponse deleteFeedPostPublic(ApiDeleteFeedPostPublicRequest)
+> DeleteFeedPostPublicResponse deleteFeedPostPublic(tenantId, postId, ApiDeleteFeedPostPublicOptions options)
 
 
 
@@ -463,7 +463,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteFeedPostPublic(ApiDeleteFeedPostPublicRequest(tenantId: tenantId, postId: postId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.deleteFeedPostPublic(tenantId, postId, ApiDeleteFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteFeedPostPublic: $e\n');
@@ -495,7 +495,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteV1PageReact**
-> CreateV1PageReact deleteV1PageReact(ApiDeleteV1PageReactRequest)
+> CreateV1PageReact deleteV1PageReact(tenantId, urlId, )
 
 
 
@@ -508,7 +508,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.deleteV1PageReact(ApiDeleteV1PageReactRequest(tenantId: tenantId, urlId: urlId));
+    final result = api_instance.deleteV1PageReact(tenantId, urlId, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteV1PageReact: $e\n');
@@ -538,7 +538,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteV2PageReact**
-> CreateV1PageReact deleteV2PageReact(ApiDeleteV2PageReactRequest)
+> CreateV1PageReact deleteV2PageReact(tenantId, urlId, id, )
 
 
 
@@ -552,7 +552,7 @@ final urlId = urlId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteV2PageReact(ApiDeleteV2PageReactRequest(tenantId: tenantId, urlId: urlId, id: id));
+    final result = api_instance.deleteV2PageReact(tenantId, urlId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteV2PageReact: $e\n');
@@ -583,7 +583,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **flagCommentPublic**
-> APIEmptyResponse flagCommentPublic(ApiFlagCommentPublicRequest)
+> APIEmptyResponse flagCommentPublic(tenantId, commentId, isFlagged, ApiFlagCommentPublicOptions options)
 
 
 
@@ -598,7 +598,7 @@ final isFlagged = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.flagCommentPublic(ApiFlagCommentPublicRequest(tenantId: tenantId, commentId: commentId, isFlagged: isFlagged, sso: sso));
+    final result = api_instance.flagCommentPublic(tenantId, commentId, isFlagged, ApiFlagCommentPublicOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->flagCommentPublic: $e\n');
@@ -630,7 +630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentText**
-> PublicAPIGetCommentTextResponse getCommentText(ApiGetCommentTextRequest)
+> PublicAPIGetCommentTextResponse getCommentText(tenantId, commentId, ApiGetCommentTextOptions options)
 
 
 
@@ -645,7 +645,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentText(ApiGetCommentTextRequest(tenantId: tenantId, commentId: commentId, editKey: editKey, sso: sso));
+    final result = api_instance.getCommentText(tenantId, commentId, ApiGetCommentTextOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentText: $e\n');
@@ -677,7 +677,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentVoteUserNames**
-> GetCommentVoteUserNamesSuccessResponse getCommentVoteUserNames(ApiGetCommentVoteUserNamesRequest)
+> GetCommentVoteUserNamesSuccessResponse getCommentVoteUserNames(tenantId, commentId, dir, ApiGetCommentVoteUserNamesOptions options)
 
 
 
@@ -692,7 +692,7 @@ final dir = 56; // int |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentVoteUserNames(ApiGetCommentVoteUserNamesRequest(tenantId: tenantId, commentId: commentId, dir: dir, sso: sso));
+    final result = api_instance.getCommentVoteUserNames(tenantId, commentId, dir, ApiGetCommentVoteUserNamesOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentVoteUserNames: $e\n');
@@ -724,7 +724,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentsForUser**
-> GetCommentsForUserResponse getCommentsForUser(ApiGetCommentsForUserRequest)
+> GetCommentsForUserResponse getCommentsForUser(ApiGetCommentsForUserOptions options)
 
 
 
@@ -742,7 +742,7 @@ final locale = locale_example; // String |
 final isCrawler = true; // bool | 
 
 try {
-    final result = api_instance.getCommentsForUser(ApiGetCommentsForUserRequest(userId: userId, direction: direction, repliesToUserId: repliesToUserId, page: page, includei10n: includei10n, locale: locale, isCrawler: isCrawler));
+    final result = api_instance.getCommentsForUser(ApiGetCommentsForUserOptions(userId: userId, direction: direction, repliesToUserId: repliesToUserId, page: page, includei10n: includei10n, locale: locale, isCrawler: isCrawler));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentsForUser: $e\n');
@@ -777,7 +777,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentsPublic**
-> GetCommentsResponseWithPresencePublicComment getCommentsPublic(ApiGetCommentsPublicRequest)
+> GetCommentsResponseWithPresencePublicComment getCommentsPublic(tenantId, urlId, ApiGetCommentsPublicOptions options)
 
 
 
@@ -818,7 +818,7 @@ final afterCommentId = afterCommentId_example; // String |
 final beforeCommentId = beforeCommentId_example; // String | 
 
 try {
-    final result = api_instance.getCommentsPublic(ApiGetCommentsPublicRequest(tenantId: tenantId, urlId: urlId, page: page, direction: direction, sso: sso, skip: skip, skipChildren: skipChildren, limit: limit, limitChildren: limitChildren, countChildren: countChildren, fetchPageForCommentId: fetchPageForCommentId, includeConfig: includeConfig, countAll: countAll, includei10n: includei10n, locale: locale, modules: modules, isCrawler: isCrawler, includeNotificationCount: includeNotificationCount, asTree: asTree, maxTreeDepth: maxTreeDepth, useFullTranslationIds: useFullTranslationIds, parentId: parentId, searchText: searchText, hashTags: hashTags, userId: userId, customConfigStr: customConfigStr, afterCommentId: afterCommentId, beforeCommentId: beforeCommentId));
+    final result = api_instance.getCommentsPublic(tenantId, urlId, ApiGetCommentsPublicOptions(page: page, direction: direction, sso: sso, skip: skip, skipChildren: skipChildren, limit: limit, limitChildren: limitChildren, countChildren: countChildren, fetchPageForCommentId: fetchPageForCommentId, includeConfig: includeConfig, countAll: countAll, includei10n: includei10n, locale: locale, modules: modules, isCrawler: isCrawler, includeNotificationCount: includeNotificationCount, asTree: asTree, maxTreeDepth: maxTreeDepth, useFullTranslationIds: useFullTranslationIds, parentId: parentId, searchText: searchText, hashTags: hashTags, userId: userId, customConfigStr: customConfigStr, afterCommentId: afterCommentId, beforeCommentId: beforeCommentId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentsPublic: $e\n');
@@ -874,7 +874,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEventLog**
-> GetEventLogResponse getEventLog(ApiGetEventLogRequest)
+> GetEventLogResponse getEventLog(tenantId, urlId, userIdWS, startTime, ApiGetEventLogOptions options)
 
 
 
@@ -892,7 +892,7 @@ final startTime = 789; // int |
 final endTime = 789; // int | 
 
 try {
-    final result = api_instance.getEventLog(ApiGetEventLogRequest(tenantId: tenantId, urlId: urlId, userIdWS: userIdWS, startTime: startTime, endTime: endTime));
+    final result = api_instance.getEventLog(tenantId, urlId, userIdWS, startTime, ApiGetEventLogOptions(endTime: endTime));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getEventLog: $e\n');
@@ -925,7 +925,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPostsPublic**
-> PublicFeedPostsResponse getFeedPostsPublic(ApiGetFeedPostsPublicRequest)
+> PublicFeedPostsResponse getFeedPostsPublic(tenantId, ApiGetFeedPostsPublicOptions options)
 
 
 
@@ -945,7 +945,7 @@ final isCrawler = true; // bool |
 final includeUserInfo = true; // bool | 
 
 try {
-    final result = api_instance.getFeedPostsPublic(ApiGetFeedPostsPublicRequest(tenantId: tenantId, afterId: afterId, limit: limit, tags: tags, sso: sso, isCrawler: isCrawler, includeUserInfo: includeUserInfo));
+    final result = api_instance.getFeedPostsPublic(tenantId, ApiGetFeedPostsPublicOptions(afterId: afterId, limit: limit, tags: tags, sso: sso, isCrawler: isCrawler, includeUserInfo: includeUserInfo));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getFeedPostsPublic: $e\n');
@@ -980,7 +980,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPostsStats**
-> FeedPostsStatsResponse getFeedPostsStats(ApiGetFeedPostsStatsRequest)
+> FeedPostsStatsResponse getFeedPostsStats(tenantId, postIds, ApiGetFeedPostsStatsOptions options)
 
 
 
@@ -994,7 +994,7 @@ final postIds = []; // List<String> |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getFeedPostsStats(ApiGetFeedPostsStatsRequest(tenantId: tenantId, postIds: postIds, sso: sso));
+    final result = api_instance.getFeedPostsStats(tenantId, postIds, ApiGetFeedPostsStatsOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getFeedPostsStats: $e\n');
@@ -1025,7 +1025,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifLarge**
-> GifGetLargeResponse getGifLarge(ApiGetGifLargeRequest)
+> GifGetLargeResponse getGifLarge(tenantId, largeInternalURLSanitized, )
 
 
 
@@ -1038,7 +1038,7 @@ final tenantId = tenantId_example; // String |
 final largeInternalURLSanitized = largeInternalURLSanitized_example; // String | 
 
 try {
-    final result = api_instance.getGifLarge(ApiGetGifLargeRequest(tenantId: tenantId, largeInternalURLSanitized: largeInternalURLSanitized));
+    final result = api_instance.getGifLarge(tenantId, largeInternalURLSanitized, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifLarge: $e\n');
@@ -1068,7 +1068,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifsSearch**
-> GetGifsSearchResponse getGifsSearch(ApiGetGifsSearchRequest)
+> GetGifsSearchResponse getGifsSearch(tenantId, search, ApiGetGifsSearchOptions options)
 
 
 
@@ -1084,7 +1084,7 @@ final rating = rating_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getGifsSearch(ApiGetGifsSearchRequest(tenantId: tenantId, search: search, locale: locale, rating: rating, page: page));
+    final result = api_instance.getGifsSearch(tenantId, search, ApiGetGifsSearchOptions(locale: locale, rating: rating, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifsSearch: $e\n');
@@ -1117,7 +1117,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifsTrending**
-> GetGifsTrendingResponse getGifsTrending(ApiGetGifsTrendingRequest)
+> GetGifsTrendingResponse getGifsTrending(tenantId, ApiGetGifsTrendingOptions options)
 
 
 
@@ -1132,7 +1132,7 @@ final rating = rating_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getGifsTrending(ApiGetGifsTrendingRequest(tenantId: tenantId, locale: locale, rating: rating, page: page));
+    final result = api_instance.getGifsTrending(tenantId, ApiGetGifsTrendingOptions(locale: locale, rating: rating, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifsTrending: $e\n');
@@ -1164,7 +1164,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGlobalEventLog**
-> GetEventLogResponse getGlobalEventLog(ApiGetGlobalEventLogRequest)
+> GetEventLogResponse getGlobalEventLog(tenantId, urlId, userIdWS, startTime, ApiGetGlobalEventLogOptions options)
 
 
 
@@ -1182,7 +1182,7 @@ final startTime = 789; // int |
 final endTime = 789; // int | 
 
 try {
-    final result = api_instance.getGlobalEventLog(ApiGetGlobalEventLogRequest(tenantId: tenantId, urlId: urlId, userIdWS: userIdWS, startTime: startTime, endTime: endTime));
+    final result = api_instance.getGlobalEventLog(tenantId, urlId, userIdWS, startTime, ApiGetGlobalEventLogOptions(endTime: endTime));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGlobalEventLog: $e\n');
@@ -1215,7 +1215,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getOfflineUsers**
-> PageUsersOfflineResponse getOfflineUsers(ApiGetOfflineUsersRequest)
+> PageUsersOfflineResponse getOfflineUsers(tenantId, urlId, ApiGetOfflineUsersOptions options)
 
 
 
@@ -1232,7 +1232,7 @@ final afterName = afterName_example; // String | Cursor: pass nextAfterName from
 final afterUserId = afterUserId_example; // String | Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
 
 try {
-    final result = api_instance.getOfflineUsers(ApiGetOfflineUsersRequest(tenantId: tenantId, urlId: urlId, afterName: afterName, afterUserId: afterUserId));
+    final result = api_instance.getOfflineUsers(tenantId, urlId, ApiGetOfflineUsersOptions(afterName: afterName, afterUserId: afterUserId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getOfflineUsers: $e\n');
@@ -1264,7 +1264,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getOnlineUsers**
-> PageUsersOnlineResponse getOnlineUsers(ApiGetOnlineUsersRequest)
+> PageUsersOnlineResponse getOnlineUsers(tenantId, urlId, ApiGetOnlineUsersOptions options)
 
 
 
@@ -1281,7 +1281,7 @@ final afterName = afterName_example; // String | Cursor: pass nextAfterName from
 final afterUserId = afterUserId_example; // String | Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
 
 try {
-    final result = api_instance.getOnlineUsers(ApiGetOnlineUsersRequest(tenantId: tenantId, urlId: urlId, afterName: afterName, afterUserId: afterUserId));
+    final result = api_instance.getOnlineUsers(tenantId, urlId, ApiGetOnlineUsersOptions(afterName: afterName, afterUserId: afterUserId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getOnlineUsers: $e\n');
@@ -1313,7 +1313,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPagesPublic**
-> GetPublicPagesResponse getPagesPublic(ApiGetPagesPublicRequest)
+> GetPublicPagesResponse getPagesPublic(tenantId, ApiGetPagesPublicOptions options)
 
 
 
@@ -1332,7 +1332,7 @@ final sortBy = ; // PagesSortBy | Sort order. `updatedAt` (default, newest first
 final hasComments = true; // bool | If true, only return pages with at least one comment.
 
 try {
-    final result = api_instance.getPagesPublic(ApiGetPagesPublicRequest(tenantId: tenantId, cursor: cursor, limit: limit, q: q, sortBy: sortBy, hasComments: hasComments));
+    final result = api_instance.getPagesPublic(tenantId, ApiGetPagesPublicOptions(cursor: cursor, limit: limit, q: q, sortBy: sortBy, hasComments: hasComments));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getPagesPublic: $e\n');
@@ -1366,7 +1366,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTranslations**
-> GetTranslationsResponse getTranslations(ApiGetTranslationsRequest)
+> GetTranslationsResponse getTranslations(namespace, component, ApiGetTranslationsOptions options)
 
 
 
@@ -1381,7 +1381,7 @@ final locale = locale_example; // String |
 final useFullTranslationIds = true; // bool | 
 
 try {
-    final result = api_instance.getTranslations(ApiGetTranslationsRequest(namespace: namespace, component: component, locale: locale, useFullTranslationIds: useFullTranslationIds));
+    final result = api_instance.getTranslations(namespace, component, ApiGetTranslationsOptions(locale: locale, useFullTranslationIds: useFullTranslationIds));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getTranslations: $e\n');
@@ -1413,7 +1413,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserNotificationCount**
-> GetUserNotificationCountResponse getUserNotificationCount(ApiGetUserNotificationCountRequest)
+> GetUserNotificationCountResponse getUserNotificationCount(tenantId, ApiGetUserNotificationCountOptions options)
 
 
 
@@ -1426,7 +1426,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserNotificationCount(ApiGetUserNotificationCountRequest(tenantId: tenantId, sso: sso));
+    final result = api_instance.getUserNotificationCount(tenantId, ApiGetUserNotificationCountOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserNotificationCount: $e\n');
@@ -1456,7 +1456,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserNotifications**
-> GetMyNotificationsResponse getUserNotifications(ApiGetUserNotificationsRequest)
+> GetMyNotificationsResponse getUserNotifications(tenantId, ApiGetUserNotificationsOptions options)
 
 
 
@@ -1479,7 +1479,7 @@ final includeTenantNotifications = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserNotifications(ApiGetUserNotificationsRequest(tenantId: tenantId, urlId: urlId, pageSize: pageSize, afterId: afterId, includeContext: includeContext, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, includeTranslations: includeTranslations, includeTenantNotifications: includeTenantNotifications, sso: sso));
+    final result = api_instance.getUserNotifications(tenantId, ApiGetUserNotificationsOptions(urlId: urlId, pageSize: pageSize, afterId: afterId, includeContext: includeContext, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, includeTranslations: includeTranslations, includeTenantNotifications: includeTenantNotifications, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserNotifications: $e\n');
@@ -1519,7 +1519,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserPresenceStatuses**
-> GetUserPresenceStatusesResponse getUserPresenceStatuses(ApiGetUserPresenceStatusesRequest)
+> GetUserPresenceStatusesResponse getUserPresenceStatuses(tenantId, urlIdWS, userIds, )
 
 
 
@@ -1533,7 +1533,7 @@ final urlIdWS = urlIdWS_example; // String |
 final userIds = userIds_example; // String | 
 
 try {
-    final result = api_instance.getUserPresenceStatuses(ApiGetUserPresenceStatusesRequest(tenantId: tenantId, urlIdWS: urlIdWS, userIds: userIds));
+    final result = api_instance.getUserPresenceStatuses(tenantId, urlIdWS, userIds, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserPresenceStatuses: $e\n');
@@ -1564,7 +1564,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserReactsPublic**
-> UserReactsResponse getUserReactsPublic(ApiGetUserReactsPublicRequest)
+> UserReactsResponse getUserReactsPublic(tenantId, ApiGetUserReactsPublicOptions options)
 
 
 
@@ -1578,7 +1578,7 @@ final postIds = []; // List<String> |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserReactsPublic(ApiGetUserReactsPublicRequest(tenantId: tenantId, postIds: postIds, sso: sso));
+    final result = api_instance.getUserReactsPublic(tenantId, ApiGetUserReactsPublicOptions(postIds: postIds, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserReactsPublic: $e\n');
@@ -1609,7 +1609,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUsersInfo**
-> PageUsersInfoResponse getUsersInfo(ApiGetUsersInfoRequest)
+> PageUsersInfoResponse getUsersInfo(tenantId, ids, )
 
 
 
@@ -1624,7 +1624,7 @@ final tenantId = tenantId_example; // String |
 final ids = ids_example; // String | Comma-delimited userIds.
 
 try {
-    final result = api_instance.getUsersInfo(ApiGetUsersInfoRequest(tenantId: tenantId, ids: ids));
+    final result = api_instance.getUsersInfo(tenantId, ids, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUsersInfo: $e\n');
@@ -1654,7 +1654,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV1PageLikes**
-> GetV1PageLikes getV1PageLikes(ApiGetV1PageLikesRequest)
+> GetV1PageLikes getV1PageLikes(tenantId, urlId, )
 
 
 
@@ -1667,7 +1667,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getV1PageLikes(ApiGetV1PageLikesRequest(tenantId: tenantId, urlId: urlId));
+    final result = api_instance.getV1PageLikes(tenantId, urlId, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV1PageLikes: $e\n');
@@ -1697,7 +1697,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV2PageReactUsers**
-> GetV2PageReactUsersResponse getV2PageReactUsers(ApiGetV2PageReactUsersRequest)
+> GetV2PageReactUsersResponse getV2PageReactUsers(tenantId, urlId, id, )
 
 
 
@@ -1711,7 +1711,7 @@ final urlId = urlId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getV2PageReactUsers(ApiGetV2PageReactUsersRequest(tenantId: tenantId, urlId: urlId, id: id));
+    final result = api_instance.getV2PageReactUsers(tenantId, urlId, id, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV2PageReactUsers: $e\n');
@@ -1742,7 +1742,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV2PageReacts**
-> GetV2PageReacts getV2PageReacts(ApiGetV2PageReactsRequest)
+> GetV2PageReacts getV2PageReacts(tenantId, urlId, )
 
 
 
@@ -1755,7 +1755,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getV2PageReacts(ApiGetV2PageReactsRequest(tenantId: tenantId, urlId: urlId));
+    final result = api_instance.getV2PageReacts(tenantId, urlId, );
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV2PageReacts: $e\n');
@@ -1785,7 +1785,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **lockComment**
-> APIEmptyResponse lockComment(ApiLockCommentRequest)
+> APIEmptyResponse lockComment(tenantId, commentId, broadcastId, ApiLockCommentOptions options)
 
 
 
@@ -1800,7 +1800,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.lockComment(ApiLockCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.lockComment(tenantId, commentId, broadcastId, ApiLockCommentOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->lockComment: $e\n');
@@ -1832,7 +1832,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **logoutPublic**
-> APIEmptyResponse logoutPublic(ApiLogoutPublicRequest)
+> APIEmptyResponse logoutPublic()
 
 
 
@@ -1843,7 +1843,7 @@ import 'package:fastcomments_dart/api.dart';
 final api_instance = PublicApi();
 
 try {
-    final result = api_instance.logoutPublic(ApiLogoutPublicRequest());
+    final result = api_instance.logoutPublic();
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->logoutPublic: $e\n');
@@ -1869,7 +1869,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **pinComment**
-> ChangeCommentPinStatusResponse pinComment(ApiPinCommentRequest)
+> ChangeCommentPinStatusResponse pinComment(tenantId, commentId, broadcastId, ApiPinCommentOptions options)
 
 
 
@@ -1884,7 +1884,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.pinComment(ApiPinCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.pinComment(tenantId, commentId, broadcastId, ApiPinCommentOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->pinComment: $e\n');
@@ -1916,7 +1916,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **reactFeedPostPublic**
-> ReactFeedPostResponse reactFeedPostPublic(ApiReactFeedPostPublicRequest)
+> ReactFeedPostResponse reactFeedPostPublic(tenantId, postId, reactBodyParams, ApiReactFeedPostPublicOptions options)
 
 
 
@@ -1933,7 +1933,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.reactFeedPostPublic(ApiReactFeedPostPublicRequest(tenantId: tenantId, postId: postId, reactBodyParams: reactBodyParams, isUndo: isUndo, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.reactFeedPostPublic(tenantId, postId, reactBodyParams, ApiReactFeedPostPublicOptions(isUndo: isUndo, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->reactFeedPostPublic: $e\n');
@@ -1967,7 +1967,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **resetUserNotificationCount**
-> ResetUserNotificationsResponse resetUserNotificationCount(ApiResetUserNotificationCountRequest)
+> ResetUserNotificationsResponse resetUserNotificationCount(tenantId, ApiResetUserNotificationCountOptions options)
 
 
 
@@ -1980,7 +1980,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.resetUserNotificationCount(ApiResetUserNotificationCountRequest(tenantId: tenantId, sso: sso));
+    final result = api_instance.resetUserNotificationCount(tenantId, ApiResetUserNotificationCountOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->resetUserNotificationCount: $e\n');
@@ -2010,7 +2010,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **resetUserNotifications**
-> ResetUserNotificationsResponse resetUserNotifications(ApiResetUserNotificationsRequest)
+> ResetUserNotificationsResponse resetUserNotifications(tenantId, ApiResetUserNotificationsOptions options)
 
 
 
@@ -2028,7 +2028,7 @@ final noDm = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.resetUserNotifications(ApiResetUserNotificationsRequest(tenantId: tenantId, afterId: afterId, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, sso: sso));
+    final result = api_instance.resetUserNotifications(tenantId, ApiResetUserNotificationsOptions(afterId: afterId, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->resetUserNotifications: $e\n');
@@ -2063,7 +2063,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **searchUsers**
-> SearchUsersResult searchUsers(ApiSearchUsersRequest)
+> SearchUsersResult searchUsers(tenantId, urlId, ApiSearchUsersOptions options)
 
 
 
@@ -2080,7 +2080,7 @@ final sso = sso_example; // String |
 final searchSection = searchSection_example; // String | 
 
 try {
-    final result = api_instance.searchUsers(ApiSearchUsersRequest(tenantId: tenantId, urlId: urlId, usernameStartsWith: usernameStartsWith, mentionGroupIds: mentionGroupIds, sso: sso, searchSection: searchSection));
+    final result = api_instance.searchUsers(tenantId, urlId, ApiSearchUsersOptions(usernameStartsWith: usernameStartsWith, mentionGroupIds: mentionGroupIds, sso: sso, searchSection: searchSection));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->searchUsers: $e\n');
@@ -2114,7 +2114,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setCommentText**
-> PublicAPISetCommentTextResponse setCommentText(ApiSetCommentTextRequest)
+> PublicAPISetCommentTextResponse setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, ApiSetCommentTextOptions options)
 
 
 
@@ -2131,7 +2131,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setCommentText(ApiSetCommentTextRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, commentTextUpdateRequest: commentTextUpdateRequest, editKey: editKey, sso: sso));
+    final result = api_instance.setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, ApiSetCommentTextOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->setCommentText: $e\n');
@@ -2165,7 +2165,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unBlockCommentPublic**
-> UnblockSuccess unBlockCommentPublic(ApiUnBlockCommentPublicRequest)
+> UnblockSuccess unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiUnBlockCommentPublicOptions options)
 
 
 
@@ -2180,7 +2180,7 @@ final publicBlockFromCommentParams = PublicBlockFromCommentParams(); // PublicBl
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unBlockCommentPublic(ApiUnBlockCommentPublicRequest(tenantId: tenantId, commentId: commentId, publicBlockFromCommentParams: publicBlockFromCommentParams, sso: sso));
+    final result = api_instance.unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiUnBlockCommentPublicOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unBlockCommentPublic: $e\n');
@@ -2212,7 +2212,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unLockComment**
-> APIEmptyResponse unLockComment(ApiUnLockCommentRequest)
+> APIEmptyResponse unLockComment(tenantId, commentId, broadcastId, ApiUnLockCommentOptions options)
 
 
 
@@ -2227,7 +2227,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unLockComment(ApiUnLockCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.unLockComment(tenantId, commentId, broadcastId, ApiUnLockCommentOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unLockComment: $e\n');
@@ -2259,7 +2259,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unPinComment**
-> ChangeCommentPinStatusResponse unPinComment(ApiUnPinCommentRequest)
+> ChangeCommentPinStatusResponse unPinComment(tenantId, commentId, broadcastId, ApiUnPinCommentOptions options)
 
 
 
@@ -2274,7 +2274,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unPinComment(ApiUnPinCommentRequest(tenantId: tenantId, commentId: commentId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.unPinComment(tenantId, commentId, broadcastId, ApiUnPinCommentOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unPinComment: $e\n');
@@ -2306,7 +2306,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateFeedPostPublic**
-> CreateFeedPostResponse updateFeedPostPublic(ApiUpdateFeedPostPublicRequest)
+> CreateFeedPostResponse updateFeedPostPublic(tenantId, postId, updateFeedPostParams, ApiUpdateFeedPostPublicOptions options)
 
 
 
@@ -2322,7 +2322,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateFeedPostPublic(ApiUpdateFeedPostPublicRequest(tenantId: tenantId, postId: postId, updateFeedPostParams: updateFeedPostParams, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.updateFeedPostPublic(tenantId, postId, updateFeedPostParams, ApiUpdateFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateFeedPostPublic: $e\n');
@@ -2355,7 +2355,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationCommentSubscriptionStatus**
-> UpdateUserNotificationCommentSubscriptionStatusResponse updateUserNotificationCommentSubscriptionStatus(ApiUpdateUserNotificationCommentSubscriptionStatusRequest)
+> UpdateUserNotificationCommentSubscriptionStatusResponse updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, ApiUpdateUserNotificationCommentSubscriptionStatusOptions options)
 
 
 
@@ -2373,7 +2373,7 @@ final commentId = commentId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationCommentSubscriptionStatus(ApiUpdateUserNotificationCommentSubscriptionStatusRequest(tenantId: tenantId, notificationId: notificationId, optedInOrOut: optedInOrOut, commentId: commentId, sso: sso));
+    final result = api_instance.updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, ApiUpdateUserNotificationCommentSubscriptionStatusOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationCommentSubscriptionStatus: $e\n');
@@ -2406,7 +2406,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationPageSubscriptionStatus**
-> UpdateUserNotificationPageSubscriptionStatusResponse updateUserNotificationPageSubscriptionStatus(ApiUpdateUserNotificationPageSubscriptionStatusRequest)
+> UpdateUserNotificationPageSubscriptionStatusResponse updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, ApiUpdateUserNotificationPageSubscriptionStatusOptions options)
 
 
 
@@ -2425,7 +2425,7 @@ final subscribedOrUnsubscribed = subscribedOrUnsubscribed_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationPageSubscriptionStatus(ApiUpdateUserNotificationPageSubscriptionStatusRequest(tenantId: tenantId, urlId: urlId, url: url, pageTitle: pageTitle, subscribedOrUnsubscribed: subscribedOrUnsubscribed, sso: sso));
+    final result = api_instance.updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, ApiUpdateUserNotificationPageSubscriptionStatusOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationPageSubscriptionStatus: $e\n');
@@ -2459,7 +2459,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationStatus**
-> UpdateUserNotificationStatusResponse updateUserNotificationStatus(ApiUpdateUserNotificationStatusRequest)
+> UpdateUserNotificationStatusResponse updateUserNotificationStatus(tenantId, notificationId, newStatus, ApiUpdateUserNotificationStatusOptions options)
 
 
 
@@ -2474,7 +2474,7 @@ final newStatus = newStatus_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationStatus(ApiUpdateUserNotificationStatusRequest(tenantId: tenantId, notificationId: notificationId, newStatus: newStatus, sso: sso));
+    final result = api_instance.updateUserNotificationStatus(tenantId, notificationId, newStatus, ApiUpdateUserNotificationStatusOptions(sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationStatus: $e\n');
@@ -2506,7 +2506,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **uploadImage**
-> UploadImageResponse uploadImage(ApiUploadImageRequest)
+> UploadImageResponse uploadImage(tenantId, file, ApiUploadImageOptions options)
 
 
 
@@ -2523,7 +2523,7 @@ final sizePreset = ; // SizePreset | Size preset: \"Default\" (1000x1000px) or \
 final urlId = urlId_example; // String | Page id that upload is happening from, to configure
 
 try {
-    final result = api_instance.uploadImage(ApiUploadImageRequest(tenantId: tenantId, file: file, sizePreset: sizePreset, urlId: urlId));
+    final result = api_instance.uploadImage(tenantId, file, ApiUploadImageOptions(sizePreset: sizePreset, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->uploadImage: $e\n');
@@ -2555,7 +2555,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **voteComment**
-> VoteResponse voteComment(ApiVoteCommentRequest)
+> VoteResponse voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, ApiVoteCommentOptions options)
 
 
 
@@ -2573,7 +2573,7 @@ final sessionId = sessionId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.voteComment(ApiVoteCommentRequest(tenantId: tenantId, commentId: commentId, urlId: urlId, broadcastId: broadcastId, voteBodyParams: voteBodyParams, sessionId: sessionId, sso: sso));
+    final result = api_instance.voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, ApiVoteCommentOptions(sessionId: sessionId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->voteComment: $e\n');
diff --git a/client/lib/api/default_api.dart b/client/lib/api/default_api.dart
index a917687..526db0f 100644
--- a/client/lib/api/default_api.dart
+++ b/client/lib/api/default_api.dart
@@ -22,9 +22,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [AddDomainConfigParams] addDomainConfigParams (required):
-  Future<Response> addDomainConfigWithHttpInfo(ApiAddDomainConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final addDomainConfigParams = request.addDomainConfigParams;
+  Future<Response> addDomainConfigWithHttpInfo(String tenantId, AddDomainConfigParams addDomainConfigParams, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs';
 
@@ -56,8 +54,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [AddDomainConfigParams] addDomainConfigParams (required):
-  Future<AddDomainConfigResponse?> addDomainConfig(ApiAddDomainConfigRequest request,) async {
-    final response = await addDomainConfigWithHttpInfo(request,);
+  Future<AddDomainConfigResponse?> addDomainConfig(String tenantId, AddDomainConfigParams addDomainConfigParams, ) async {
+    final response = await addDomainConfigWithHttpInfo(tenantId, addDomainConfigParams, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -77,9 +75,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<Response> addHashTagWithHttpInfo(ApiAddHashTagRequest request,) async {
-    final tenantId = request.tenantId;
-    final createHashTagBody = request.createHashTagBody;
+  Future<Response> addHashTagWithHttpInfo(CreateHashTagBody createHashTagBody, [ ApiAddHashTagOptions? options, ]) async {
+    final tenantId = options?.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -113,8 +110,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<CreateHashTagResponse?> addHashTag(ApiAddHashTagRequest request,) async {
-    final response = await addHashTagWithHttpInfo(request,);
+  Future<CreateHashTagResponse?> addHashTag(CreateHashTagBody createHashTagBody, [ ApiAddHashTagOptions? options, ]) async {
+    final response = await addHashTagWithHttpInfo(createHashTagBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -134,9 +131,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<Response> addHashTagsBulkWithHttpInfo(ApiAddHashTagsBulkRequest request,) async {
-    final tenantId = request.tenantId;
-    final bulkCreateHashTagsBody = request.bulkCreateHashTagsBody;
+  Future<Response> addHashTagsBulkWithHttpInfo(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ ApiAddHashTagsBulkOptions? options, ]) async {
+    final tenantId = options?.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/bulk';
 
@@ -170,8 +166,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(ApiAddHashTagsBulkRequest request,) async {
-    final response = await addHashTagsBulkWithHttpInfo(request,);
+  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ ApiAddHashTagsBulkOptions? options, ]) async {
+    final response = await addHashTagsBulkWithHttpInfo(bulkCreateHashTagsBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -191,9 +187,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIPageData] createAPIPageData (required):
-  Future<Response> addPageWithHttpInfo(ApiAddPageRequest request,) async {
-    final tenantId = request.tenantId;
-    final createAPIPageData = request.createAPIPageData;
+  Future<Response> addPageWithHttpInfo(String tenantId, CreateAPIPageData createAPIPageData, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages';
 
@@ -225,8 +219,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIPageData] createAPIPageData (required):
-  Future<AddPageAPIResponse?> addPage(ApiAddPageRequest request,) async {
-    final response = await addPageWithHttpInfo(request,);
+  Future<AddPageAPIResponse?> addPage(String tenantId, CreateAPIPageData createAPIPageData, ) async {
+    final response = await addPageWithHttpInfo(tenantId, createAPIPageData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -246,9 +240,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPISSOUserData] createAPISSOUserData (required):
-  Future<Response> addSSOUserWithHttpInfo(ApiAddSSOUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final createAPISSOUserData = request.createAPISSOUserData;
+  Future<Response> addSSOUserWithHttpInfo(String tenantId, CreateAPISSOUserData createAPISSOUserData, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -280,8 +272,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPISSOUserData] createAPISSOUserData (required):
-  Future<AddSSOUserAPIResponse?> addSSOUser(ApiAddSSOUserRequest request,) async {
-    final response = await addSSOUserWithHttpInfo(request,);
+  Future<AddSSOUserAPIResponse?> addSSOUser(String tenantId, CreateAPISSOUserData createAPISSOUserData, ) async {
+    final response = await addSSOUserWithHttpInfo(tenantId, createAPISSOUserData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -308,11 +300,9 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<Response> aggregateWithHttpInfo(ApiAggregateRequest request,) async {
-    final tenantId = request.tenantId;
-    final aggregationRequest = request.aggregationRequest;
-    final parentTenantId = request.parentTenantId;
-    final includeStats = request.includeStats;
+  Future<Response> aggregateWithHttpInfo(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options, ]) async {
+    final parentTenantId = options?.parentTenantId;
+    final includeStats = options?.includeStats;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/aggregate';
 
@@ -356,8 +346,8 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<AggregateResponse?> aggregate(ApiAggregateRequest request,) async {
-    final response = await aggregateWithHttpInfo(request,);
+  Future<AggregateResponse?> aggregate(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options, ]) async {
+    final response = await aggregateWithHttpInfo(tenantId, aggregationRequest, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -387,14 +377,13 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> aggregateQuestionResultsWithHttpInfo(ApiAggregateQuestionResultsRequest request,) async {
-    final tenantId = request.tenantId;
-    final questionId = request.questionId;
-    final questionIds = request.questionIds;
-    final urlId = request.urlId;
-    final timeBucket = request.timeBucket;
-    final startDate = request.startDate;
-    final forceRecalculate = request.forceRecalculate;
+  Future<Response> aggregateQuestionResultsWithHttpInfo(String tenantId, [ ApiAggregateQuestionResultsOptions? options, ]) async {
+    final questionId = options?.questionId;
+    final questionIds = options?.questionIds;
+    final urlId = options?.urlId;
+    final timeBucket = options?.timeBucket;
+    final startDate = options?.startDate;
+    final forceRecalculate = options?.forceRecalculate;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation';
 
@@ -454,8 +443,8 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(ApiAggregateQuestionResultsRequest request,) async {
-    final response = await aggregateQuestionResultsWithHttpInfo(request,);
+  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(String tenantId, [ ApiAggregateQuestionResultsOptions? options, ]) async {
+    final response = await aggregateQuestionResultsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -481,12 +470,9 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> blockUserFromCommentWithHttpInfo(ApiBlockUserFromCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final blockFromCommentParams = request.blockFromCommentParams;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
+  Future<Response> blockUserFromCommentWithHttpInfo(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options, ]) async {
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/block'
       .replaceAll('{id}', id);
@@ -531,8 +517,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<BlockSuccess?> blockUserFromComment(ApiBlockUserFromCommentRequest request,) async {
-    final response = await blockUserFromCommentWithHttpInfo(request,);
+  Future<BlockSuccess?> blockUserFromComment(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options, ]) async {
+    final response = await blockUserFromCommentWithHttpInfo(tenantId, id, blockFromCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -554,10 +540,8 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(ApiBulkAggregateQuestionResultsRequest request,) async {
-    final tenantId = request.tenantId;
-    final bulkAggregateQuestionResultsRequest = request.bulkAggregateQuestionResultsRequest;
-    final forceRecalculate = request.forceRecalculate;
+  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ ApiBulkAggregateQuestionResultsOptions? options, ]) async {
+    final forceRecalculate = options?.forceRecalculate;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation/bulk';
 
@@ -594,8 +578,8 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(ApiBulkAggregateQuestionResultsRequest request,) async {
-    final response = await bulkAggregateQuestionResultsWithHttpInfo(request,);
+  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ ApiBulkAggregateQuestionResultsOptions? options, ]) async {
+    final response = await bulkAggregateQuestionResultsWithHttpInfo(tenantId, bulkAggregateQuestionResultsRequest, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -619,11 +603,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ChangeTicketStateBody] changeTicketStateBody (required):
-  Future<Response> changeTicketStateWithHttpInfo(ApiChangeTicketStateRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final id = request.id;
-    final changeTicketStateBody = request.changeTicketStateBody;
+  Future<Response> changeTicketStateWithHttpInfo(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}/state'
       .replaceAll('{id}', id);
@@ -661,8 +641,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ChangeTicketStateBody] changeTicketStateBody (required):
-  Future<ChangeTicketStateResponse?> changeTicketState(ApiChangeTicketStateRequest request,) async {
-    final response = await changeTicketStateWithHttpInfo(request,);
+  Future<ChangeTicketStateResponse?> changeTicketState(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody, ) async {
+    final response = await changeTicketStateWithHttpInfo(tenantId, userId, id, changeTicketStateBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -696,16 +676,15 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(ApiCombineCommentsWithQuestionResultsRequest request,) async {
-    final tenantId = request.tenantId;
-    final questionId = request.questionId;
-    final questionIds = request.questionIds;
-    final urlId = request.urlId;
-    final startDate = request.startDate;
-    final forceRecalculate = request.forceRecalculate;
-    final minValue = request.minValue;
-    final maxValue = request.maxValue;
-    final limit = request.limit;
+  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options, ]) async {
+    final questionId = options?.questionId;
+    final questionIds = options?.questionIds;
+    final urlId = options?.urlId;
+    final startDate = options?.startDate;
+    final forceRecalculate = options?.forceRecalculate;
+    final minValue = options?.minValue;
+    final maxValue = options?.maxValue;
+    final limit = options?.limit;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation/combine/comments';
 
@@ -775,8 +754,8 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(ApiCombineCommentsWithQuestionResultsRequest request,) async {
-    final response = await combineCommentsWithQuestionResultsWithHttpInfo(request,);
+  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options, ]) async {
+    final response = await combineCommentsWithQuestionResultsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -796,9 +775,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateEmailTemplateBody] createEmailTemplateBody (required):
-  Future<Response> createEmailTemplateWithHttpInfo(ApiCreateEmailTemplateRequest request,) async {
-    final tenantId = request.tenantId;
-    final createEmailTemplateBody = request.createEmailTemplateBody;
+  Future<Response> createEmailTemplateWithHttpInfo(String tenantId, CreateEmailTemplateBody createEmailTemplateBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -830,8 +807,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateEmailTemplateBody] createEmailTemplateBody (required):
-  Future<CreateEmailTemplateResponse?> createEmailTemplate(ApiCreateEmailTemplateRequest request,) async {
-    final response = await createEmailTemplateWithHttpInfo(request,);
+  Future<CreateEmailTemplateResponse?> createEmailTemplate(String tenantId, CreateEmailTemplateBody createEmailTemplateBody, ) async {
+    final response = await createEmailTemplateWithHttpInfo(tenantId, createEmailTemplateBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -859,13 +836,11 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<Response> createFeedPostWithHttpInfo(ApiCreateFeedPostRequest request,) async {
-    final tenantId = request.tenantId;
-    final createFeedPostParams = request.createFeedPostParams;
-    final broadcastId = request.broadcastId;
-    final isLive = request.isLive;
-    final doSpamCheck = request.doSpamCheck;
-    final skipDupCheck = request.skipDupCheck;
+  Future<Response> createFeedPostWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options, ]) async {
+    final broadcastId = options?.broadcastId;
+    final isLive = options?.isLive;
+    final doSpamCheck = options?.doSpamCheck;
+    final skipDupCheck = options?.skipDupCheck;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts';
 
@@ -917,8 +892,8 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<CreateFeedPostsResponse?> createFeedPost(ApiCreateFeedPostRequest request,) async {
-    final response = await createFeedPostWithHttpInfo(request,);
+  Future<CreateFeedPostsResponse?> createFeedPost(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options, ]) async {
+    final response = await createFeedPostWithHttpInfo(tenantId, createFeedPostParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -938,9 +913,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateModeratorBody] createModeratorBody (required):
-  Future<Response> createModeratorWithHttpInfo(ApiCreateModeratorRequest request,) async {
-    final tenantId = request.tenantId;
-    final createModeratorBody = request.createModeratorBody;
+  Future<Response> createModeratorWithHttpInfo(String tenantId, CreateModeratorBody createModeratorBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -972,8 +945,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateModeratorBody] createModeratorBody (required):
-  Future<CreateModeratorResponse?> createModerator(ApiCreateModeratorRequest request,) async {
-    final response = await createModeratorWithHttpInfo(request,);
+  Future<CreateModeratorResponse?> createModerator(String tenantId, CreateModeratorBody createModeratorBody, ) async {
+    final response = await createModeratorWithHttpInfo(tenantId, createModeratorBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -993,9 +966,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionConfigBody] createQuestionConfigBody (required):
-  Future<Response> createQuestionConfigWithHttpInfo(ApiCreateQuestionConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final createQuestionConfigBody = request.createQuestionConfigBody;
+  Future<Response> createQuestionConfigWithHttpInfo(String tenantId, CreateQuestionConfigBody createQuestionConfigBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -1027,8 +998,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionConfigBody] createQuestionConfigBody (required):
-  Future<CreateQuestionConfigResponse?> createQuestionConfig(ApiCreateQuestionConfigRequest request,) async {
-    final response = await createQuestionConfigWithHttpInfo(request,);
+  Future<CreateQuestionConfigResponse?> createQuestionConfig(String tenantId, CreateQuestionConfigBody createQuestionConfigBody, ) async {
+    final response = await createQuestionConfigWithHttpInfo(tenantId, createQuestionConfigBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1048,9 +1019,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionResultBody] createQuestionResultBody (required):
-  Future<Response> createQuestionResultWithHttpInfo(ApiCreateQuestionResultRequest request,) async {
-    final tenantId = request.tenantId;
-    final createQuestionResultBody = request.createQuestionResultBody;
+  Future<Response> createQuestionResultWithHttpInfo(String tenantId, CreateQuestionResultBody createQuestionResultBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results';
 
@@ -1082,8 +1051,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionResultBody] createQuestionResultBody (required):
-  Future<CreateQuestionResultResponse?> createQuestionResult(ApiCreateQuestionResultRequest request,) async {
-    final response = await createQuestionResultWithHttpInfo(request,);
+  Future<CreateQuestionResultResponse?> createQuestionResult(String tenantId, CreateQuestionResultBody createQuestionResultBody, ) async {
+    final response = await createQuestionResultWithHttpInfo(tenantId, createQuestionResultBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1103,9 +1072,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIUserSubscriptionData] createAPIUserSubscriptionData (required):
-  Future<Response> createSubscriptionWithHttpInfo(ApiCreateSubscriptionRequest request,) async {
-    final tenantId = request.tenantId;
-    final createAPIUserSubscriptionData = request.createAPIUserSubscriptionData;
+  Future<Response> createSubscriptionWithHttpInfo(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -1137,8 +1104,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIUserSubscriptionData] createAPIUserSubscriptionData (required):
-  Future<CreateSubscriptionAPIResponse?> createSubscription(ApiCreateSubscriptionRequest request,) async {
-    final response = await createSubscriptionWithHttpInfo(request,);
+  Future<CreateSubscriptionAPIResponse?> createSubscription(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData, ) async {
+    final response = await createSubscriptionWithHttpInfo(tenantId, createAPIUserSubscriptionData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1158,9 +1125,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantBody] createTenantBody (required):
-  Future<Response> createTenantWithHttpInfo(ApiCreateTenantRequest request,) async {
-    final tenantId = request.tenantId;
-    final createTenantBody = request.createTenantBody;
+  Future<Response> createTenantWithHttpInfo(String tenantId, CreateTenantBody createTenantBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants';
 
@@ -1192,8 +1157,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantBody] createTenantBody (required):
-  Future<CreateTenantResponse?> createTenant(ApiCreateTenantRequest request,) async {
-    final response = await createTenantWithHttpInfo(request,);
+  Future<CreateTenantResponse?> createTenant(String tenantId, CreateTenantBody createTenantBody, ) async {
+    final response = await createTenantWithHttpInfo(tenantId, createTenantBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1213,9 +1178,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantPackageBody] createTenantPackageBody (required):
-  Future<Response> createTenantPackageWithHttpInfo(ApiCreateTenantPackageRequest request,) async {
-    final tenantId = request.tenantId;
-    final createTenantPackageBody = request.createTenantPackageBody;
+  Future<Response> createTenantPackageWithHttpInfo(String tenantId, CreateTenantPackageBody createTenantPackageBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -1247,8 +1210,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantPackageBody] createTenantPackageBody (required):
-  Future<CreateTenantPackageResponse?> createTenantPackage(ApiCreateTenantPackageRequest request,) async {
-    final response = await createTenantPackageWithHttpInfo(request,);
+  Future<CreateTenantPackageResponse?> createTenantPackage(String tenantId, CreateTenantPackageBody createTenantPackageBody, ) async {
+    final response = await createTenantPackageWithHttpInfo(tenantId, createTenantPackageBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1268,9 +1231,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantUserBody] createTenantUserBody (required):
-  Future<Response> createTenantUserWithHttpInfo(ApiCreateTenantUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final createTenantUserBody = request.createTenantUserBody;
+  Future<Response> createTenantUserWithHttpInfo(String tenantId, CreateTenantUserBody createTenantUserBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -1302,8 +1263,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantUserBody] createTenantUserBody (required):
-  Future<CreateTenantUserResponse?> createTenantUser(ApiCreateTenantUserRequest request,) async {
-    final response = await createTenantUserWithHttpInfo(request,);
+  Future<CreateTenantUserResponse?> createTenantUser(String tenantId, CreateTenantUserBody createTenantUserBody, ) async {
+    final response = await createTenantUserWithHttpInfo(tenantId, createTenantUserBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1325,10 +1286,7 @@ class DefaultApi {
   /// * [String] userId (required):
   ///
   /// * [CreateTicketBody] createTicketBody (required):
-  Future<Response> createTicketWithHttpInfo(ApiCreateTicketRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final createTicketBody = request.createTicketBody;
+  Future<Response> createTicketWithHttpInfo(String tenantId, String userId, CreateTicketBody createTicketBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets';
 
@@ -1363,8 +1321,8 @@ class DefaultApi {
   /// * [String] userId (required):
   ///
   /// * [CreateTicketBody] createTicketBody (required):
-  Future<CreateTicketResponse?> createTicket(ApiCreateTicketRequest request,) async {
-    final response = await createTicketWithHttpInfo(request,);
+  Future<CreateTicketResponse?> createTicket(String tenantId, String userId, CreateTicketBody createTicketBody, ) async {
+    final response = await createTicketWithHttpInfo(tenantId, userId, createTicketBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1384,9 +1342,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateUserBadgeParams] createUserBadgeParams (required):
-  Future<Response> createUserBadgeWithHttpInfo(ApiCreateUserBadgeRequest request,) async {
-    final tenantId = request.tenantId;
-    final createUserBadgeParams = request.createUserBadgeParams;
+  Future<Response> createUserBadgeWithHttpInfo(String tenantId, CreateUserBadgeParams createUserBadgeParams, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges';
 
@@ -1418,8 +1374,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateUserBadgeParams] createUserBadgeParams (required):
-  Future<APICreateUserBadgeResponse?> createUserBadge(ApiCreateUserBadgeRequest request,) async {
-    final response = await createUserBadgeWithHttpInfo(request,);
+  Future<APICreateUserBadgeResponse?> createUserBadge(String tenantId, CreateUserBadgeParams createUserBadgeParams, ) async {
+    final response = await createUserBadgeWithHttpInfo(tenantId, createUserBadgeParams, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1445,12 +1401,9 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> createVoteWithHttpInfo(ApiCreateVoteRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final direction = request.direction;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
+  Future<Response> createVoteWithHttpInfo(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options, ]) async {
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes';
 
@@ -1496,8 +1449,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<VoteResponse?> createVote(ApiCreateVoteRequest request,) async {
-    final response = await createVoteWithHttpInfo(request,);
+  Future<VoteResponse?> createVote(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options, ]) async {
+    final response = await createVoteWithHttpInfo(tenantId, commentId, direction, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1521,11 +1474,9 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<Response> deleteCommentWithHttpInfo(ApiDeleteCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final contextUserId = request.contextUserId;
-    final isLive = request.isLive;
+  Future<Response> deleteCommentWithHttpInfo(String tenantId, String id, [ ApiDeleteCommentOptions? options, ]) async {
+    final contextUserId = options?.contextUserId;
+    final isLive = options?.isLive;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -1568,8 +1519,8 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<DeleteCommentResult?> deleteComment(ApiDeleteCommentRequest request,) async {
-    final response = await deleteCommentWithHttpInfo(request,);
+  Future<DeleteCommentResult?> deleteComment(String tenantId, String id, [ ApiDeleteCommentOptions? options, ]) async {
+    final response = await deleteCommentWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1589,9 +1540,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<Response> deleteDomainConfigWithHttpInfo(ApiDeleteDomainConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final domain = request.domain;
+  Future<Response> deleteDomainConfigWithHttpInfo(String tenantId, String domain, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domain}'
       .replaceAll('{domain}', domain);
@@ -1624,8 +1573,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<DeleteDomainConfigResponse?> deleteDomainConfig(ApiDeleteDomainConfigRequest request,) async {
-    final response = await deleteDomainConfigWithHttpInfo(request,);
+  Future<DeleteDomainConfigResponse?> deleteDomainConfig(String tenantId, String domain, ) async {
+    final response = await deleteDomainConfigWithHttpInfo(tenantId, domain, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1645,9 +1594,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteEmailTemplateWithHttpInfo(ApiDeleteEmailTemplateRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deleteEmailTemplateWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -1680,8 +1627,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteEmailTemplate(ApiDeleteEmailTemplateRequest request,) async {
-    final response = await deleteEmailTemplateWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteEmailTemplate(String tenantId, String id, ) async {
+    final response = await deleteEmailTemplateWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1703,10 +1650,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] errorId (required):
-  Future<Response> deleteEmailTemplateRenderErrorWithHttpInfo(ApiDeleteEmailTemplateRenderErrorRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final errorId = request.errorId;
+  Future<Response> deleteEmailTemplateRenderErrorWithHttpInfo(String tenantId, String id, String errorId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors/{errorId}'
       .replaceAll('{id}', id)
@@ -1742,8 +1686,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] errorId (required):
-  Future<APIEmptyResponse?> deleteEmailTemplateRenderError(ApiDeleteEmailTemplateRenderErrorRequest request,) async {
-    final response = await deleteEmailTemplateRenderErrorWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteEmailTemplateRenderError(String tenantId, String id, String errorId, ) async {
+    final response = await deleteEmailTemplateRenderErrorWithHttpInfo(tenantId, id, errorId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1765,10 +1709,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<Response> deleteHashTagWithHttpInfo(ApiDeleteHashTagRequest request,) async {
-    final tag = request.tag;
-    final tenantId = request.tenantId;
-    final deleteHashTagRequestBody = request.deleteHashTagRequestBody;
+  Future<Response> deleteHashTagWithHttpInfo(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ ApiDeleteHashTagOptions? options, ]) async {
+    final tenantId = options?.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -1805,8 +1747,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<APIEmptyResponse?> deleteHashTag(ApiDeleteHashTagRequest request,) async {
-    final response = await deleteHashTagWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteHashTag(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ ApiDeleteHashTagOptions? options, ]) async {
+    final response = await deleteHashTagWithHttpInfo(tag, deleteHashTagRequestBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1828,10 +1770,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<Response> deleteModeratorWithHttpInfo(ApiDeleteModeratorRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final sendEmail = request.sendEmail;
+  Future<Response> deleteModeratorWithHttpInfo(String tenantId, String id, [ ApiDeleteModeratorOptions? options, ]) async {
+    final sendEmail = options?.sendEmail;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -1869,8 +1809,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<APIEmptyResponse?> deleteModerator(ApiDeleteModeratorRequest request,) async {
-    final response = await deleteModeratorWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteModerator(String tenantId, String id, [ ApiDeleteModeratorOptions? options, ]) async {
+    final response = await deleteModeratorWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1890,9 +1830,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteNotificationCountWithHttpInfo(ApiDeleteNotificationCountRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deleteNotificationCountWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notification-count/{id}'
       .replaceAll('{id}', id);
@@ -1925,8 +1863,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteNotificationCount(ApiDeleteNotificationCountRequest request,) async {
-    final response = await deleteNotificationCountWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteNotificationCount(String tenantId, String id, ) async {
+    final response = await deleteNotificationCountWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1946,9 +1884,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deletePageWithHttpInfo(ApiDeletePageRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deletePageWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/{id}'
       .replaceAll('{id}', id);
@@ -1981,8 +1917,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<DeletePageAPIResponse?> deletePage(ApiDeletePageRequest request,) async {
-    final response = await deletePageWithHttpInfo(request,);
+  Future<DeletePageAPIResponse?> deletePage(String tenantId, String id, ) async {
+    final response = await deletePageWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2002,9 +1938,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deletePendingWebhookEventWithHttpInfo(ApiDeletePendingWebhookEventRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deletePendingWebhookEventWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events/{id}'
       .replaceAll('{id}', id);
@@ -2037,8 +1971,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deletePendingWebhookEvent(ApiDeletePendingWebhookEventRequest request,) async {
-    final response = await deletePendingWebhookEventWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deletePendingWebhookEvent(String tenantId, String id, ) async {
+    final response = await deletePendingWebhookEventWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2058,9 +1992,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteQuestionConfigWithHttpInfo(ApiDeleteQuestionConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deleteQuestionConfigWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -2093,8 +2025,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteQuestionConfig(ApiDeleteQuestionConfigRequest request,) async {
-    final response = await deleteQuestionConfigWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteQuestionConfig(String tenantId, String id, ) async {
+    final response = await deleteQuestionConfigWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2114,9 +2046,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteQuestionResultWithHttpInfo(ApiDeleteQuestionResultRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deleteQuestionResultWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -2149,8 +2079,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteQuestionResult(ApiDeleteQuestionResultRequest request,) async {
-    final response = await deleteQuestionResultWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteQuestionResult(String tenantId, String id, ) async {
+    final response = await deleteQuestionResultWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2174,11 +2104,9 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteSSOUserWithHttpInfo(ApiDeleteSSOUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final deleteComments = request.deleteComments;
-    final commentDeleteMode = request.commentDeleteMode;
+  Future<Response> deleteSSOUserWithHttpInfo(String tenantId, String id, [ ApiDeleteSSOUserOptions? options, ]) async {
+    final deleteComments = options?.deleteComments;
+    final commentDeleteMode = options?.commentDeleteMode;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -2221,8 +2149,8 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(ApiDeleteSSOUserRequest request,) async {
-    final response = await deleteSSOUserWithHttpInfo(request,);
+  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(String tenantId, String id, [ ApiDeleteSSOUserOptions? options, ]) async {
+    final response = await deleteSSOUserWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2244,10 +2172,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> deleteSubscriptionWithHttpInfo(ApiDeleteSubscriptionRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final userId = request.userId;
+  Future<Response> deleteSubscriptionWithHttpInfo(String tenantId, String id, [ ApiDeleteSubscriptionOptions? options, ]) async {
+    final userId = options?.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -2285,8 +2211,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(ApiDeleteSubscriptionRequest request,) async {
-    final response = await deleteSubscriptionWithHttpInfo(request,);
+  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(String tenantId, String id, [ ApiDeleteSubscriptionOptions? options, ]) async {
+    final response = await deleteSubscriptionWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2308,10 +2234,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<Response> deleteTenantWithHttpInfo(ApiDeleteTenantRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final sure = request.sure;
+  Future<Response> deleteTenantWithHttpInfo(String tenantId, String id, [ ApiDeleteTenantOptions? options, ]) async {
+    final sure = options?.sure;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -2349,8 +2273,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<APIEmptyResponse?> deleteTenant(ApiDeleteTenantRequest request,) async {
-    final response = await deleteTenantWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteTenant(String tenantId, String id, [ ApiDeleteTenantOptions? options, ]) async {
+    final response = await deleteTenantWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2370,9 +2294,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteTenantPackageWithHttpInfo(ApiDeleteTenantPackageRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deleteTenantPackageWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -2405,8 +2327,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteTenantPackage(ApiDeleteTenantPackageRequest request,) async {
-    final response = await deleteTenantPackageWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteTenantPackage(String tenantId, String id, ) async {
+    final response = await deleteTenantPackageWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2430,11 +2352,9 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteTenantUserWithHttpInfo(ApiDeleteTenantUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final deleteComments = request.deleteComments;
-    final commentDeleteMode = request.commentDeleteMode;
+  Future<Response> deleteTenantUserWithHttpInfo(String tenantId, String id, [ ApiDeleteTenantUserOptions? options, ]) async {
+    final deleteComments = options?.deleteComments;
+    final commentDeleteMode = options?.commentDeleteMode;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -2477,8 +2397,8 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<APIEmptyResponse?> deleteTenantUser(ApiDeleteTenantUserRequest request,) async {
-    final response = await deleteTenantUserWithHttpInfo(request,);
+  Future<APIEmptyResponse?> deleteTenantUser(String tenantId, String id, [ ApiDeleteTenantUserOptions? options, ]) async {
+    final response = await deleteTenantUserWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2498,9 +2418,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteUserBadgeWithHttpInfo(ApiDeleteUserBadgeRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> deleteUserBadgeWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -2533,8 +2451,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptySuccessResponse?> deleteUserBadge(ApiDeleteUserBadgeRequest request,) async {
-    final response = await deleteUserBadgeWithHttpInfo(request,);
+  Future<APIEmptySuccessResponse?> deleteUserBadge(String tenantId, String id, ) async {
+    final response = await deleteUserBadgeWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2556,10 +2474,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<Response> deleteVoteWithHttpInfo(ApiDeleteVoteRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final editKey = request.editKey;
+  Future<Response> deleteVoteWithHttpInfo(String tenantId, String id, [ ApiDeleteVoteOptions? options, ]) async {
+    final editKey = options?.editKey;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes/{id}'
       .replaceAll('{id}', id);
@@ -2597,8 +2513,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<VoteDeleteResponse?> deleteVote(ApiDeleteVoteRequest request,) async {
-    final response = await deleteVoteWithHttpInfo(request,);
+  Future<VoteDeleteResponse?> deleteVote(String tenantId, String id, [ ApiDeleteVoteOptions? options, ]) async {
+    final response = await deleteVoteWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2622,11 +2538,9 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> flagCommentWithHttpInfo(ApiFlagCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
+  Future<Response> flagCommentWithHttpInfo(String tenantId, String id, [ ApiFlagCommentOptions? options, ]) async {
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/flag'
       .replaceAll('{id}', id);
@@ -2669,8 +2583,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> flagComment(ApiFlagCommentRequest request,) async {
-    final response = await flagCommentWithHttpInfo(request,);
+  Future<FlagCommentResponse?> flagComment(String tenantId, String id, [ ApiFlagCommentOptions? options, ]) async {
+    final response = await flagCommentWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2698,13 +2612,12 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<Response> getAuditLogsWithHttpInfo(ApiGetAuditLogsRequest request,) async {
-    final tenantId = request.tenantId;
-    final limit = request.limit;
-    final skip = request.skip;
-    final order = request.order;
-    final after = request.after;
-    final before = request.before;
+  Future<Response> getAuditLogsWithHttpInfo(String tenantId, [ ApiGetAuditLogsOptions? options, ]) async {
+    final limit = options?.limit;
+    final skip = options?.skip;
+    final order = options?.order;
+    final after = options?.after;
+    final before = options?.before;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/audit-logs';
 
@@ -2759,8 +2672,8 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<GetAuditLogsResponse?> getAuditLogs(ApiGetAuditLogsRequest request,) async {
-    final response = await getAuditLogsWithHttpInfo(request,);
+  Future<GetAuditLogsResponse?> getAuditLogs(String tenantId, [ ApiGetAuditLogsOptions? options, ]) async {
+    final response = await getAuditLogsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2780,9 +2693,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getCachedNotificationCountWithHttpInfo(ApiGetCachedNotificationCountRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getCachedNotificationCountWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notification-count/{id}'
       .replaceAll('{id}', id);
@@ -2815,8 +2726,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetCachedNotificationCountResponse?> getCachedNotificationCount(ApiGetCachedNotificationCountRequest request,) async {
-    final response = await getCachedNotificationCountWithHttpInfo(request,);
+  Future<GetCachedNotificationCountResponse?> getCachedNotificationCount(String tenantId, String id, ) async {
+    final response = await getCachedNotificationCountWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2836,9 +2747,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getCommentWithHttpInfo(ApiGetCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getCommentWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -2871,8 +2780,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetCommentResponse?> getComment(ApiGetCommentRequest request,) async {
-    final response = await getCommentWithHttpInfo(request,);
+  Future<APIGetCommentResponse?> getComment(String tenantId, String id, ) async {
+    final response = await getCommentWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2922,24 +2831,23 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<Response> getCommentsWithHttpInfo(ApiGetCommentsRequest request,) async {
-    final tenantId = request.tenantId;
-    final page = request.page;
-    final limit = request.limit;
-    final skip = request.skip;
-    final asTree = request.asTree;
-    final skipChildren = request.skipChildren;
-    final limitChildren = request.limitChildren;
-    final maxTreeDepth = request.maxTreeDepth;
-    final urlId = request.urlId;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
-    final contextUserId = request.contextUserId;
-    final hashTag = request.hashTag;
-    final parentId = request.parentId;
-    final direction = request.direction;
-    final fromDate = request.fromDate;
-    final toDate = request.toDate;
+  Future<Response> getCommentsWithHttpInfo(String tenantId, [ ApiGetCommentsOptions? options, ]) async {
+    final page = options?.page;
+    final limit = options?.limit;
+    final skip = options?.skip;
+    final asTree = options?.asTree;
+    final skipChildren = options?.skipChildren;
+    final limitChildren = options?.limitChildren;
+    final maxTreeDepth = options?.maxTreeDepth;
+    final urlId = options?.urlId;
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
+    final contextUserId = options?.contextUserId;
+    final hashTag = options?.hashTag;
+    final parentId = options?.parentId;
+    final direction = options?.direction;
+    final fromDate = options?.fromDate;
+    final toDate = options?.toDate;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments';
 
@@ -3049,8 +2957,8 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<APIGetCommentsResponse?> getComments(ApiGetCommentsRequest request,) async {
-    final response = await getCommentsWithHttpInfo(request,);
+  Future<APIGetCommentsResponse?> getComments(String tenantId, [ ApiGetCommentsOptions? options, ]) async {
+    final response = await getCommentsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3070,9 +2978,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<Response> getDomainConfigWithHttpInfo(ApiGetDomainConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final domain = request.domain;
+  Future<Response> getDomainConfigWithHttpInfo(String tenantId, String domain, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domain}'
       .replaceAll('{domain}', domain);
@@ -3105,8 +3011,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<GetDomainConfigResponse?> getDomainConfig(ApiGetDomainConfigRequest request,) async {
-    final response = await getDomainConfigWithHttpInfo(request,);
+  Future<GetDomainConfigResponse?> getDomainConfig(String tenantId, String domain, ) async {
+    final response = await getDomainConfigWithHttpInfo(tenantId, domain, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3124,8 +3030,7 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getDomainConfigsWithHttpInfo(ApiGetDomainConfigsRequest request,) async {
-    final tenantId = request.tenantId;
+  Future<Response> getDomainConfigsWithHttpInfo(String tenantId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs';
 
@@ -3155,8 +3060,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetDomainConfigsResponse?> getDomainConfigs(ApiGetDomainConfigsRequest request,) async {
-    final response = await getDomainConfigsWithHttpInfo(request,);
+  Future<GetDomainConfigsResponse?> getDomainConfigs(String tenantId, ) async {
+    final response = await getDomainConfigsWithHttpInfo(tenantId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3176,9 +3081,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getEmailTemplateWithHttpInfo(ApiGetEmailTemplateRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getEmailTemplateWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -3211,8 +3114,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetEmailTemplateResponse?> getEmailTemplate(ApiGetEmailTemplateRequest request,) async {
-    final response = await getEmailTemplateWithHttpInfo(request,);
+  Future<GetEmailTemplateResponse?> getEmailTemplate(String tenantId, String id, ) async {
+    final response = await getEmailTemplateWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3230,8 +3133,7 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getEmailTemplateDefinitionsWithHttpInfo(ApiGetEmailTemplateDefinitionsRequest request,) async {
-    final tenantId = request.tenantId;
+  Future<Response> getEmailTemplateDefinitionsWithHttpInfo(String tenantId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/definitions';
 
@@ -3261,8 +3163,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetEmailTemplateDefinitionsResponse?> getEmailTemplateDefinitions(ApiGetEmailTemplateDefinitionsRequest request,) async {
-    final response = await getEmailTemplateDefinitionsWithHttpInfo(request,);
+  Future<GetEmailTemplateDefinitionsResponse?> getEmailTemplateDefinitions(String tenantId, ) async {
+    final response = await getEmailTemplateDefinitionsWithHttpInfo(tenantId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3284,10 +3186,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(ApiGetEmailTemplateRenderErrorsRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final skip = request.skip;
+  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(String tenantId, String id, [ ApiGetEmailTemplateRenderErrorsOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors'
       .replaceAll('{id}', id);
@@ -3325,8 +3225,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(ApiGetEmailTemplateRenderErrorsRequest request,) async {
-    final response = await getEmailTemplateRenderErrorsWithHttpInfo(request,);
+  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(String tenantId, String id, [ ApiGetEmailTemplateRenderErrorsOptions? options, ]) async {
+    final response = await getEmailTemplateRenderErrorsWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3346,9 +3246,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplatesWithHttpInfo(ApiGetEmailTemplatesRequest request,) async {
-    final tenantId = request.tenantId;
-    final skip = request.skip;
+  Future<Response> getEmailTemplatesWithHttpInfo(String tenantId, [ ApiGetEmailTemplatesOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -3383,8 +3282,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplatesResponse?> getEmailTemplates(ApiGetEmailTemplatesRequest request,) async {
-    final response = await getEmailTemplatesWithHttpInfo(request,);
+  Future<GetEmailTemplatesResponse?> getEmailTemplates(String tenantId, [ ApiGetEmailTemplatesOptions? options, ]) async {
+    final response = await getEmailTemplatesWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3411,11 +3310,10 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<Response> getFeedPostsWithHttpInfo(ApiGetFeedPostsRequest request,) async {
-    final tenantId = request.tenantId;
-    final afterId = request.afterId;
-    final limit = request.limit;
-    final tags = request.tags;
+  Future<Response> getFeedPostsWithHttpInfo(String tenantId, [ ApiGetFeedPostsOptions? options, ]) async {
+    final afterId = options?.afterId;
+    final limit = options?.limit;
+    final tags = options?.tags;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts';
 
@@ -3462,8 +3360,8 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<GetFeedPostsResponse?> getFeedPosts(ApiGetFeedPostsRequest request,) async {
-    final response = await getFeedPostsWithHttpInfo(request,);
+  Future<GetFeedPostsResponse?> getFeedPosts(String tenantId, [ ApiGetFeedPostsOptions? options, ]) async {
+    final response = await getFeedPostsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3483,9 +3381,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<Response> getHashTagsWithHttpInfo(ApiGetHashTagsRequest request,) async {
-    final tenantId = request.tenantId;
-    final page = request.page;
+  Future<Response> getHashTagsWithHttpInfo(String tenantId, [ ApiGetHashTagsOptions? options, ]) async {
+    final page = options?.page;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -3520,8 +3417,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<GetHashTagsResponse?> getHashTags(ApiGetHashTagsRequest request,) async {
-    final response = await getHashTagsWithHttpInfo(request,);
+  Future<GetHashTagsResponse?> getHashTags(String tenantId, [ ApiGetHashTagsOptions? options, ]) async {
+    final response = await getHashTagsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3541,9 +3438,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getModeratorWithHttpInfo(ApiGetModeratorRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getModeratorWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -3576,8 +3471,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetModeratorResponse?> getModerator(ApiGetModeratorRequest request,) async {
-    final response = await getModeratorWithHttpInfo(request,);
+  Future<GetModeratorResponse?> getModerator(String tenantId, String id, ) async {
+    final response = await getModeratorWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3597,9 +3492,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getModeratorsWithHttpInfo(ApiGetModeratorsRequest request,) async {
-    final tenantId = request.tenantId;
-    final skip = request.skip;
+  Future<Response> getModeratorsWithHttpInfo(String tenantId, [ ApiGetModeratorsOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -3634,8 +3528,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetModeratorsResponse?> getModerators(ApiGetModeratorsRequest request,) async {
-    final response = await getModeratorsWithHttpInfo(request,);
+  Future<GetModeratorsResponse?> getModerators(String tenantId, [ ApiGetModeratorsOptions? options, ]) async {
+    final response = await getModeratorsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3663,13 +3557,12 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<Response> getNotificationCountWithHttpInfo(ApiGetNotificationCountRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final urlId = request.urlId;
-    final fromCommentId = request.fromCommentId;
-    final viewed = request.viewed;
-    final type = request.type;
+  Future<Response> getNotificationCountWithHttpInfo(String tenantId, [ ApiGetNotificationCountOptions? options, ]) async {
+    final userId = options?.userId;
+    final urlId = options?.urlId;
+    final fromCommentId = options?.fromCommentId;
+    final viewed = options?.viewed;
+    final type = options?.type;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications/count';
 
@@ -3724,8 +3617,8 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<GetNotificationCountResponse?> getNotificationCount(ApiGetNotificationCountRequest request,) async {
-    final response = await getNotificationCountWithHttpInfo(request,);
+  Future<GetNotificationCountResponse?> getNotificationCount(String tenantId, [ ApiGetNotificationCountOptions? options, ]) async {
+    final response = await getNotificationCountWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3755,14 +3648,13 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<Response> getNotificationsWithHttpInfo(ApiGetNotificationsRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final urlId = request.urlId;
-    final fromCommentId = request.fromCommentId;
-    final viewed = request.viewed;
-    final type = request.type;
-    final skip = request.skip;
+  Future<Response> getNotificationsWithHttpInfo(String tenantId, [ ApiGetNotificationsOptions? options, ]) async {
+    final userId = options?.userId;
+    final urlId = options?.urlId;
+    final fromCommentId = options?.fromCommentId;
+    final viewed = options?.viewed;
+    final type = options?.type;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications';
 
@@ -3822,8 +3714,8 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<GetNotificationsResponse?> getNotifications(ApiGetNotificationsRequest request,) async {
-    final response = await getNotificationsWithHttpInfo(request,);
+  Future<GetNotificationsResponse?> getNotifications(String tenantId, [ ApiGetNotificationsOptions? options, ]) async {
+    final response = await getNotificationsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3843,9 +3735,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getPageByURLIdWithHttpInfo(ApiGetPageByURLIdRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
+  Future<Response> getPageByURLIdWithHttpInfo(String tenantId, String urlId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/by-url-id';
 
@@ -3878,8 +3768,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetPageByURLIdAPIResponse?> getPageByURLId(ApiGetPageByURLIdRequest request,) async {
-    final response = await getPageByURLIdWithHttpInfo(request,);
+  Future<GetPageByURLIdAPIResponse?> getPageByURLId(String tenantId, String urlId, ) async {
+    final response = await getPageByURLIdWithHttpInfo(tenantId, urlId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3897,8 +3787,7 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getPagesWithHttpInfo(ApiGetPagesRequest request,) async {
-    final tenantId = request.tenantId;
+  Future<Response> getPagesWithHttpInfo(String tenantId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages';
 
@@ -3928,8 +3817,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetPagesAPIResponse?> getPages(ApiGetPagesRequest request,) async {
-    final response = await getPagesWithHttpInfo(request,);
+  Future<GetPagesAPIResponse?> getPages(String tenantId, ) async {
+    final response = await getPagesWithHttpInfo(tenantId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3959,14 +3848,13 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<Response> getPendingWebhookEventCountWithHttpInfo(ApiGetPendingWebhookEventCountRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final externalId = request.externalId;
-    final eventType = request.eventType;
-    final type = request.type;
-    final domain = request.domain;
-    final attemptCountGT = request.attemptCountGT;
+  Future<Response> getPendingWebhookEventCountWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options, ]) async {
+    final commentId = options?.commentId;
+    final externalId = options?.externalId;
+    final eventType = options?.eventType;
+    final type = options?.type;
+    final domain = options?.domain;
+    final attemptCountGT = options?.attemptCountGT;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events/count';
 
@@ -4026,8 +3914,8 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(ApiGetPendingWebhookEventCountRequest request,) async {
-    final response = await getPendingWebhookEventCountWithHttpInfo(request,);
+  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options, ]) async {
+    final response = await getPendingWebhookEventCountWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4059,15 +3947,14 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<Response> getPendingWebhookEventsWithHttpInfo(ApiGetPendingWebhookEventsRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final externalId = request.externalId;
-    final eventType = request.eventType;
-    final type = request.type;
-    final domain = request.domain;
-    final attemptCountGT = request.attemptCountGT;
-    final skip = request.skip;
+  Future<Response> getPendingWebhookEventsWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventsOptions? options, ]) async {
+    final commentId = options?.commentId;
+    final externalId = options?.externalId;
+    final eventType = options?.eventType;
+    final type = options?.type;
+    final domain = options?.domain;
+    final attemptCountGT = options?.attemptCountGT;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events';
 
@@ -4132,8 +4019,8 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(ApiGetPendingWebhookEventsRequest request,) async {
-    final response = await getPendingWebhookEventsWithHttpInfo(request,);
+  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(String tenantId, [ ApiGetPendingWebhookEventsOptions? options, ]) async {
+    final response = await getPendingWebhookEventsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4153,9 +4040,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getQuestionConfigWithHttpInfo(ApiGetQuestionConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getQuestionConfigWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -4188,8 +4073,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetQuestionConfigResponse?> getQuestionConfig(ApiGetQuestionConfigRequest request,) async {
-    final response = await getQuestionConfigWithHttpInfo(request,);
+  Future<GetQuestionConfigResponse?> getQuestionConfig(String tenantId, String id, ) async {
+    final response = await getQuestionConfigWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4209,9 +4094,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getQuestionConfigsWithHttpInfo(ApiGetQuestionConfigsRequest request,) async {
-    final tenantId = request.tenantId;
-    final skip = request.skip;
+  Future<Response> getQuestionConfigsWithHttpInfo(String tenantId, [ ApiGetQuestionConfigsOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -4246,8 +4130,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetQuestionConfigsResponse?> getQuestionConfigs(ApiGetQuestionConfigsRequest request,) async {
-    final response = await getQuestionConfigsWithHttpInfo(request,);
+  Future<GetQuestionConfigsResponse?> getQuestionConfigs(String tenantId, [ ApiGetQuestionConfigsOptions? options, ]) async {
+    final response = await getQuestionConfigsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4267,9 +4151,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getQuestionResultWithHttpInfo(ApiGetQuestionResultRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getQuestionResultWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -4302,8 +4184,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetQuestionResultResponse?> getQuestionResult(ApiGetQuestionResultRequest request,) async {
-    final response = await getQuestionResultWithHttpInfo(request,);
+  Future<GetQuestionResultResponse?> getQuestionResult(String tenantId, String id, ) async {
+    final response = await getQuestionResultWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4333,14 +4215,13 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<Response> getQuestionResultsWithHttpInfo(ApiGetQuestionResultsRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final userId = request.userId;
-    final startDate = request.startDate;
-    final questionId = request.questionId;
-    final questionIds = request.questionIds;
-    final skip = request.skip;
+  Future<Response> getQuestionResultsWithHttpInfo(String tenantId, [ ApiGetQuestionResultsOptions? options, ]) async {
+    final urlId = options?.urlId;
+    final userId = options?.userId;
+    final startDate = options?.startDate;
+    final questionId = options?.questionId;
+    final questionIds = options?.questionIds;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results';
 
@@ -4400,8 +4281,8 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<GetQuestionResultsResponse?> getQuestionResults(ApiGetQuestionResultsRequest request,) async {
-    final response = await getQuestionResultsWithHttpInfo(request,);
+  Future<GetQuestionResultsResponse?> getQuestionResults(String tenantId, [ ApiGetQuestionResultsOptions? options, ]) async {
+    final response = await getQuestionResultsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4421,9 +4302,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] email (required):
-  Future<Response> getSSOUserByEmailWithHttpInfo(ApiGetSSOUserByEmailRequest request,) async {
-    final tenantId = request.tenantId;
-    final email = request.email;
+  Future<Response> getSSOUserByEmailWithHttpInfo(String tenantId, String email, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/by-email/{email}'
       .replaceAll('{email}', email);
@@ -4456,8 +4335,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] email (required):
-  Future<GetSSOUserByEmailAPIResponse?> getSSOUserByEmail(ApiGetSSOUserByEmailRequest request,) async {
-    final response = await getSSOUserByEmailWithHttpInfo(request,);
+  Future<GetSSOUserByEmailAPIResponse?> getSSOUserByEmail(String tenantId, String email, ) async {
+    final response = await getSSOUserByEmailWithHttpInfo(tenantId, email, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4477,9 +4356,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getSSOUserByIdWithHttpInfo(ApiGetSSOUserByIdRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getSSOUserByIdWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/by-id/{id}'
       .replaceAll('{id}', id);
@@ -4512,8 +4389,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetSSOUserByIdAPIResponse?> getSSOUserById(ApiGetSSOUserByIdRequest request,) async {
-    final response = await getSSOUserByIdWithHttpInfo(request,);
+  Future<GetSSOUserByIdAPIResponse?> getSSOUserById(String tenantId, String id, ) async {
+    final response = await getSSOUserByIdWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4533,9 +4410,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<Response> getSSOUsersWithHttpInfo(ApiGetSSOUsersRequest request,) async {
-    final tenantId = request.tenantId;
-    final skip = request.skip;
+  Future<Response> getSSOUsersWithHttpInfo(String tenantId, [ ApiGetSSOUsersOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -4570,8 +4446,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<GetSSOUsersResponse?> getSSOUsers(ApiGetSSOUsersRequest request,) async {
-    final response = await getSSOUsersWithHttpInfo(request,);
+  Future<GetSSOUsersResponse?> getSSOUsers(String tenantId, [ ApiGetSSOUsersOptions? options, ]) async {
+    final response = await getSSOUsersWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4591,9 +4467,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<Response> getSubscriptionsWithHttpInfo(ApiGetSubscriptionsRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
+  Future<Response> getSubscriptionsWithHttpInfo(String tenantId, [ ApiGetSubscriptionsOptions? options, ]) async {
+    final userId = options?.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -4628,8 +4503,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<GetSubscriptionsAPIResponse?> getSubscriptions(ApiGetSubscriptionsRequest request,) async {
-    final response = await getSubscriptionsWithHttpInfo(request,);
+  Future<GetSubscriptionsAPIResponse?> getSubscriptions(String tenantId, [ ApiGetSubscriptionsOptions? options, ]) async {
+    final response = await getSubscriptionsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4649,9 +4524,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantWithHttpInfo(ApiGetTenantRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getTenantWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -4684,8 +4557,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantResponse?> getTenant(ApiGetTenantRequest request,) async {
-    final response = await getTenantWithHttpInfo(request,);
+  Future<GetTenantResponse?> getTenant(String tenantId, String id, ) async {
+    final response = await getTenantWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4711,12 +4584,11 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<Response> getTenantDailyUsagesWithHttpInfo(ApiGetTenantDailyUsagesRequest request,) async {
-    final tenantId = request.tenantId;
-    final yearNumber = request.yearNumber;
-    final monthNumber = request.monthNumber;
-    final dayNumber = request.dayNumber;
-    final skip = request.skip;
+  Future<Response> getTenantDailyUsagesWithHttpInfo(String tenantId, [ ApiGetTenantDailyUsagesOptions? options, ]) async {
+    final yearNumber = options?.yearNumber;
+    final monthNumber = options?.monthNumber;
+    final dayNumber = options?.dayNumber;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-daily-usage';
 
@@ -4766,8 +4638,8 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(ApiGetTenantDailyUsagesRequest request,) async {
-    final response = await getTenantDailyUsagesWithHttpInfo(request,);
+  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(String tenantId, [ ApiGetTenantDailyUsagesOptions? options, ]) async {
+    final response = await getTenantDailyUsagesWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4787,9 +4659,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantPackageWithHttpInfo(ApiGetTenantPackageRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getTenantPackageWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -4822,8 +4692,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantPackageResponse?> getTenantPackage(ApiGetTenantPackageRequest request,) async {
-    final response = await getTenantPackageWithHttpInfo(request,);
+  Future<GetTenantPackageResponse?> getTenantPackage(String tenantId, String id, ) async {
+    final response = await getTenantPackageWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4843,9 +4713,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantPackagesWithHttpInfo(ApiGetTenantPackagesRequest request,) async {
-    final tenantId = request.tenantId;
-    final skip = request.skip;
+  Future<Response> getTenantPackagesWithHttpInfo(String tenantId, [ ApiGetTenantPackagesOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -4880,8 +4749,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantPackagesResponse?> getTenantPackages(ApiGetTenantPackagesRequest request,) async {
-    final response = await getTenantPackagesWithHttpInfo(request,);
+  Future<GetTenantPackagesResponse?> getTenantPackages(String tenantId, [ ApiGetTenantPackagesOptions? options, ]) async {
+    final response = await getTenantPackagesWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4901,9 +4770,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantUserWithHttpInfo(ApiGetTenantUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getTenantUserWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -4936,8 +4803,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantUserResponse?> getTenantUser(ApiGetTenantUserRequest request,) async {
-    final response = await getTenantUserWithHttpInfo(request,);
+  Future<GetTenantUserResponse?> getTenantUser(String tenantId, String id, ) async {
+    final response = await getTenantUserWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4957,9 +4824,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantUsersWithHttpInfo(ApiGetTenantUsersRequest request,) async {
-    final tenantId = request.tenantId;
-    final skip = request.skip;
+  Future<Response> getTenantUsersWithHttpInfo(String tenantId, [ ApiGetTenantUsersOptions? options, ]) async {
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -4994,8 +4860,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantUsersResponse?> getTenantUsers(ApiGetTenantUsersRequest request,) async {
-    final response = await getTenantUsersWithHttpInfo(request,);
+  Future<GetTenantUsersResponse?> getTenantUsers(String tenantId, [ ApiGetTenantUsersOptions? options, ]) async {
+    final response = await getTenantUsersWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5017,10 +4883,9 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<Response> getTenantsWithHttpInfo(ApiGetTenantsRequest request,) async {
-    final tenantId = request.tenantId;
-    final meta = request.meta;
-    final skip = request.skip;
+  Future<Response> getTenantsWithHttpInfo(String tenantId, [ ApiGetTenantsOptions? options, ]) async {
+    final meta = options?.meta;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants';
 
@@ -5060,8 +4925,8 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<GetTenantsResponse?> getTenants(ApiGetTenantsRequest request,) async {
-    final response = await getTenantsWithHttpInfo(request,);
+  Future<GetTenantsResponse?> getTenants(String tenantId, [ ApiGetTenantsOptions? options, ]) async {
+    final response = await getTenantsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5083,10 +4948,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> getTicketWithHttpInfo(ApiGetTicketRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final userId = request.userId;
+  Future<Response> getTicketWithHttpInfo(String tenantId, String id, [ ApiGetTicketOptions? options, ]) async {
+    final userId = options?.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}'
       .replaceAll('{id}', id);
@@ -5124,8 +4987,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<GetTicketResponse?> getTicket(ApiGetTicketRequest request,) async {
-    final response = await getTicketWithHttpInfo(request,);
+  Future<GetTicketResponse?> getTicket(String tenantId, String id, [ ApiGetTicketOptions? options, ]) async {
+    final response = await getTicketWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5151,12 +5014,11 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<Response> getTicketsWithHttpInfo(ApiGetTicketsRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final state = request.state;
-    final skip = request.skip;
-    final limit = request.limit;
+  Future<Response> getTicketsWithHttpInfo(String tenantId, [ ApiGetTicketsOptions? options, ]) async {
+    final userId = options?.userId;
+    final state = options?.state;
+    final skip = options?.skip;
+    final limit = options?.limit;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets';
 
@@ -5206,8 +5068,8 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<GetTicketsResponse?> getTickets(ApiGetTicketsRequest request,) async {
-    final response = await getTicketsWithHttpInfo(request,);
+  Future<GetTicketsResponse?> getTickets(String tenantId, [ ApiGetTicketsOptions? options, ]) async {
+    final response = await getTicketsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5227,9 +5089,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserWithHttpInfo(ApiGetUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getUserWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/users/{id}'
       .replaceAll('{id}', id);
@@ -5262,8 +5122,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetUserResponse?> getUser(ApiGetUserRequest request,) async {
-    final response = await getUserWithHttpInfo(request,);
+  Future<GetUserResponse?> getUser(String tenantId, String id, ) async {
+    final response = await getUserWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5283,9 +5143,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserBadgeWithHttpInfo(ApiGetUserBadgeRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getUserBadgeWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -5318,8 +5176,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetUserBadgeResponse?> getUserBadge(ApiGetUserBadgeRequest request,) async {
-    final response = await getUserBadgeWithHttpInfo(request,);
+  Future<APIGetUserBadgeResponse?> getUserBadge(String tenantId, String id, ) async {
+    final response = await getUserBadgeWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5339,9 +5197,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserBadgeProgressByIdWithHttpInfo(ApiGetUserBadgeProgressByIdRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
+  Future<Response> getUserBadgeProgressByIdWithHttpInfo(String tenantId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress/{id}'
       .replaceAll('{id}', id);
@@ -5374,8 +5230,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressById(ApiGetUserBadgeProgressByIdRequest request,) async {
-    final response = await getUserBadgeProgressByIdWithHttpInfo(request,);
+  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressById(String tenantId, String id, ) async {
+    final response = await getUserBadgeProgressByIdWithHttpInfo(tenantId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5395,9 +5251,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId (required):
-  Future<Response> getUserBadgeProgressByUserIdWithHttpInfo(ApiGetUserBadgeProgressByUserIdRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
+  Future<Response> getUserBadgeProgressByUserIdWithHttpInfo(String tenantId, String userId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress/user/{userId}'
       .replaceAll('{userId}', userId);
@@ -5430,8 +5284,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId (required):
-  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressByUserId(ApiGetUserBadgeProgressByUserIdRequest request,) async {
-    final response = await getUserBadgeProgressByUserIdWithHttpInfo(request,);
+  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressByUserId(String tenantId, String userId, ) async {
+    final response = await getUserBadgeProgressByUserIdWithHttpInfo(tenantId, userId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5455,11 +5309,10 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgeProgressListWithHttpInfo(ApiGetUserBadgeProgressListRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final limit = request.limit;
-    final skip = request.skip;
+  Future<Response> getUserBadgeProgressListWithHttpInfo(String tenantId, [ ApiGetUserBadgeProgressListOptions? options, ]) async {
+    final userId = options?.userId;
+    final limit = options?.limit;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress';
 
@@ -5504,8 +5357,8 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(ApiGetUserBadgeProgressListRequest request,) async {
-    final response = await getUserBadgeProgressListWithHttpInfo(request,);
+  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(String tenantId, [ ApiGetUserBadgeProgressListOptions? options, ]) async {
+    final response = await getUserBadgeProgressListWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5535,14 +5388,13 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgesWithHttpInfo(ApiGetUserBadgesRequest request,) async {
-    final tenantId = request.tenantId;
-    final userId = request.userId;
-    final badgeId = request.badgeId;
-    final type = request.type;
-    final displayedOnComments = request.displayedOnComments;
-    final limit = request.limit;
-    final skip = request.skip;
+  Future<Response> getUserBadgesWithHttpInfo(String tenantId, [ ApiGetUserBadgesOptions? options, ]) async {
+    final userId = options?.userId;
+    final badgeId = options?.badgeId;
+    final type = options?.type;
+    final displayedOnComments = options?.displayedOnComments;
+    final limit = options?.limit;
+    final skip = options?.skip;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges';
 
@@ -5602,8 +5454,8 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgesResponse?> getUserBadges(ApiGetUserBadgesRequest request,) async {
-    final response = await getUserBadgesWithHttpInfo(request,);
+  Future<APIGetUserBadgesResponse?> getUserBadges(String tenantId, [ ApiGetUserBadgesOptions? options, ]) async {
+    final response = await getUserBadgesWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5623,9 +5475,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getVotesWithHttpInfo(ApiGetVotesRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
+  Future<Response> getVotesWithHttpInfo(String tenantId, String urlId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes';
 
@@ -5658,8 +5508,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetVotesResponse?> getVotes(ApiGetVotesRequest request,) async {
-    final response = await getVotesWithHttpInfo(request,);
+  Future<GetVotesResponse?> getVotes(String tenantId, String urlId, ) async {
+    final response = await getVotesWithHttpInfo(tenantId, urlId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5683,11 +5533,9 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> getVotesForUserWithHttpInfo(ApiGetVotesForUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
+  Future<Response> getVotesForUserWithHttpInfo(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options, ]) async {
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes/for-user';
 
@@ -5730,8 +5578,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<GetVotesForUserResponse?> getVotesForUser(ApiGetVotesForUserRequest request,) async {
-    final response = await getVotesForUserWithHttpInfo(request,);
+  Future<GetVotesForUserResponse?> getVotesForUser(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options, ]) async {
+    final response = await getVotesForUserWithHttpInfo(tenantId, urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5753,10 +5601,7 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [PatchDomainConfigParams] patchDomainConfigParams (required):
-  Future<Response> patchDomainConfigWithHttpInfo(ApiPatchDomainConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final domainToUpdate = request.domainToUpdate;
-    final patchDomainConfigParams = request.patchDomainConfigParams;
+  Future<Response> patchDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domainToUpdate}'
       .replaceAll('{domainToUpdate}', domainToUpdate);
@@ -5791,8 +5636,8 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [PatchDomainConfigParams] patchDomainConfigParams (required):
-  Future<PatchDomainConfigResponse?> patchDomainConfig(ApiPatchDomainConfigRequest request,) async {
-    final response = await patchDomainConfigWithHttpInfo(request,);
+  Future<PatchDomainConfigResponse?> patchDomainConfig(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams, ) async {
+    final response = await patchDomainConfigWithHttpInfo(tenantId, domainToUpdate, patchDomainConfigParams, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5814,10 +5659,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<Response> patchHashTagWithHttpInfo(ApiPatchHashTagRequest request,) async {
-    final tag = request.tag;
-    final tenantId = request.tenantId;
-    final updateHashTagBody = request.updateHashTagBody;
+  Future<Response> patchHashTagWithHttpInfo(String tag, UpdateHashTagBody updateHashTagBody, [ ApiPatchHashTagOptions? options, ]) async {
+    final tenantId = options?.tenantId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -5854,8 +5697,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<UpdateHashTagResponse?> patchHashTag(ApiPatchHashTagRequest request,) async {
-    final response = await patchHashTagWithHttpInfo(request,);
+  Future<UpdateHashTagResponse?> patchHashTag(String tag, UpdateHashTagBody updateHashTagBody, [ ApiPatchHashTagOptions? options, ]) async {
+    final response = await patchHashTagWithHttpInfo(tag, updateHashTagBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5877,10 +5720,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateAPIPageData] updateAPIPageData (required):
-  Future<Response> patchPageWithHttpInfo(ApiPatchPageRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateAPIPageData = request.updateAPIPageData;
+  Future<Response> patchPageWithHttpInfo(String tenantId, String id, UpdateAPIPageData updateAPIPageData, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/{id}'
       .replaceAll('{id}', id);
@@ -5915,8 +5755,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateAPIPageData] updateAPIPageData (required):
-  Future<PatchPageAPIResponse?> patchPage(ApiPatchPageRequest request,) async {
-    final response = await patchPageWithHttpInfo(request,);
+  Future<PatchPageAPIResponse?> patchPage(String tenantId, String id, UpdateAPIPageData updateAPIPageData, ) async {
+    final response = await patchPageWithHttpInfo(tenantId, id, updateAPIPageData, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5940,11 +5780,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> patchSSOUserWithHttpInfo(ApiPatchSSOUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateAPISSOUserData = request.updateAPISSOUserData;
-    final updateComments = request.updateComments;
+  Future<Response> patchSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPatchSSOUserOptions? options, ]) async {
+    final updateComments = options?.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5984,8 +5821,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PatchSSOUserAPIResponse?> patchSSOUser(ApiPatchSSOUserRequest request,) async {
-    final response = await patchSSOUserWithHttpInfo(request,);
+  Future<PatchSSOUserAPIResponse?> patchSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPatchSSOUserOptions? options, ]) async {
+    final response = await patchSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6007,10 +5844,7 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [UpdateDomainConfigParams] updateDomainConfigParams (required):
-  Future<Response> putDomainConfigWithHttpInfo(ApiPutDomainConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final domainToUpdate = request.domainToUpdate;
-    final updateDomainConfigParams = request.updateDomainConfigParams;
+  Future<Response> putDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domainToUpdate}'
       .replaceAll('{domainToUpdate}', domainToUpdate);
@@ -6045,8 +5879,8 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [UpdateDomainConfigParams] updateDomainConfigParams (required):
-  Future<PutDomainConfigResponse?> putDomainConfig(ApiPutDomainConfigRequest request,) async {
-    final response = await putDomainConfigWithHttpInfo(request,);
+  Future<PutDomainConfigResponse?> putDomainConfig(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams, ) async {
+    final response = await putDomainConfigWithHttpInfo(tenantId, domainToUpdate, updateDomainConfigParams, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6070,11 +5904,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> putSSOUserWithHttpInfo(ApiPutSSOUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateAPISSOUserData = request.updateAPISSOUserData;
-    final updateComments = request.updateComments;
+  Future<Response> putSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPutSSOUserOptions? options, ]) async {
+    final updateComments = options?.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -6114,8 +5945,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PutSSOUserAPIResponse?> putSSOUser(ApiPutSSOUserRequest request,) async {
-    final response = await putSSOUserWithHttpInfo(request,);
+  Future<PutSSOUserAPIResponse?> putSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPutSSOUserOptions? options, ]) async {
+    final response = await putSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6137,10 +5968,8 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<Response> renderEmailTemplateWithHttpInfo(ApiRenderEmailTemplateRequest request,) async {
-    final tenantId = request.tenantId;
-    final renderEmailTemplateBody = request.renderEmailTemplateBody;
-    final locale = request.locale;
+  Future<Response> renderEmailTemplateWithHttpInfo(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ ApiRenderEmailTemplateOptions? options, ]) async {
+    final locale = options?.locale;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/render';
 
@@ -6177,8 +6006,8 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<RenderEmailTemplateResponse?> renderEmailTemplate(ApiRenderEmailTemplateRequest request,) async {
-    final response = await renderEmailTemplateWithHttpInfo(request,);
+  Future<RenderEmailTemplateResponse?> renderEmailTemplate(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ ApiRenderEmailTemplateOptions? options, ]) async {
+    final response = await renderEmailTemplateWithHttpInfo(tenantId, renderEmailTemplateBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6200,10 +6029,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ReplaceTenantPackageBody] replaceTenantPackageBody (required):
-  Future<Response> replaceTenantPackageWithHttpInfo(ApiReplaceTenantPackageRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final replaceTenantPackageBody = request.replaceTenantPackageBody;
+  Future<Response> replaceTenantPackageWithHttpInfo(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -6238,8 +6064,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ReplaceTenantPackageBody] replaceTenantPackageBody (required):
-  Future<APIEmptyResponse?> replaceTenantPackage(ApiReplaceTenantPackageRequest request,) async {
-    final response = await replaceTenantPackageWithHttpInfo(request,);
+  Future<APIEmptyResponse?> replaceTenantPackage(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody, ) async {
+    final response = await replaceTenantPackageWithHttpInfo(tenantId, id, replaceTenantPackageBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6263,11 +6089,8 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> replaceTenantUserWithHttpInfo(ApiReplaceTenantUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final replaceTenantUserBody = request.replaceTenantUserBody;
-    final updateComments = request.updateComments;
+  Future<Response> replaceTenantUserWithHttpInfo(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ ApiReplaceTenantUserOptions? options, ]) async {
+    final updateComments = options?.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -6307,8 +6130,8 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> replaceTenantUser(ApiReplaceTenantUserRequest request,) async {
-    final response = await replaceTenantUserWithHttpInfo(request,);
+  Future<APIEmptyResponse?> replaceTenantUser(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ ApiReplaceTenantUserOptions? options, ]) async {
+    final response = await replaceTenantUserWithHttpInfo(tenantId, id, replaceTenantUserBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6336,13 +6159,11 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentWithHttpInfo(ApiSaveCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final createCommentParams = request.createCommentParams;
-    final isLive = request.isLive;
-    final doSpamCheck = request.doSpamCheck;
-    final sendEmails = request.sendEmails;
-    final populateNotifications = request.populateNotifications;
+  Future<Response> saveCommentWithHttpInfo(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options, ]) async {
+    final isLive = options?.isLive;
+    final doSpamCheck = options?.doSpamCheck;
+    final sendEmails = options?.sendEmails;
+    final populateNotifications = options?.populateNotifications;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments';
 
@@ -6394,8 +6215,8 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<APISaveCommentResponse?> saveComment(ApiSaveCommentRequest request,) async {
-    final response = await saveCommentWithHttpInfo(request,);
+  Future<APISaveCommentResponse?> saveComment(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options, ]) async {
+    final response = await saveCommentWithHttpInfo(tenantId, createCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6423,13 +6244,11 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentsBulkWithHttpInfo(ApiSaveCommentsBulkRequest request,) async {
-    final tenantId = request.tenantId;
-    final createCommentParams = request.createCommentParams;
-    final isLive = request.isLive;
-    final doSpamCheck = request.doSpamCheck;
-    final sendEmails = request.sendEmails;
-    final populateNotifications = request.populateNotifications;
+  Future<Response> saveCommentsBulkWithHttpInfo(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options, ]) async {
+    final isLive = options?.isLive;
+    final doSpamCheck = options?.doSpamCheck;
+    final sendEmails = options?.sendEmails;
+    final populateNotifications = options?.populateNotifications;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/bulk';
 
@@ -6481,8 +6300,8 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(ApiSaveCommentsBulkRequest request,) async {
-    final response = await saveCommentsBulkWithHttpInfo(request,);
+  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options, ]) async {
+    final response = await saveCommentsBulkWithHttpInfo(tenantId, createCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6507,10 +6326,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] fromName (required):
-  Future<Response> sendInviteWithHttpInfo(ApiSendInviteRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final fromName = request.fromName;
+  Future<Response> sendInviteWithHttpInfo(String tenantId, String id, String fromName, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}/send-invite'
       .replaceAll('{id}', id);
@@ -6546,8 +6362,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] fromName (required):
-  Future<APIEmptyResponse?> sendInvite(ApiSendInviteRequest request,) async {
-    final response = await sendInviteWithHttpInfo(request,);
+  Future<APIEmptyResponse?> sendInvite(String tenantId, String id, String fromName, ) async {
+    final response = await sendInviteWithHttpInfo(tenantId, id, fromName, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6569,10 +6385,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<Response> sendLoginLinkWithHttpInfo(ApiSendLoginLinkRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final redirectURL = request.redirectURL;
+  Future<Response> sendLoginLinkWithHttpInfo(String tenantId, String id, [ ApiSendLoginLinkOptions? options, ]) async {
+    final redirectURL = options?.redirectURL;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}/send-login-link'
       .replaceAll('{id}', id);
@@ -6610,8 +6424,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<APIEmptyResponse?> sendLoginLink(ApiSendLoginLinkRequest request,) async {
-    final response = await sendLoginLinkWithHttpInfo(request,);
+  Future<APIEmptyResponse?> sendLoginLink(String tenantId, String id, [ ApiSendLoginLinkOptions? options, ]) async {
+    final response = await sendLoginLinkWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6637,12 +6451,9 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unBlockUserFromCommentWithHttpInfo(ApiUnBlockUserFromCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final unBlockFromCommentParams = request.unBlockFromCommentParams;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
+  Future<Response> unBlockUserFromCommentWithHttpInfo(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options, ]) async {
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/un-block'
       .replaceAll('{id}', id);
@@ -6687,8 +6498,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<UnblockSuccess?> unBlockUserFromComment(ApiUnBlockUserFromCommentRequest request,) async {
-    final response = await unBlockUserFromCommentWithHttpInfo(request,);
+  Future<UnblockSuccess?> unBlockUserFromComment(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options, ]) async {
+    final response = await unBlockUserFromCommentWithHttpInfo(tenantId, id, unBlockFromCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6712,11 +6523,9 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unFlagCommentWithHttpInfo(ApiUnFlagCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final userId = request.userId;
-    final anonUserId = request.anonUserId;
+  Future<Response> unFlagCommentWithHttpInfo(String tenantId, String id, [ ApiUnFlagCommentOptions? options, ]) async {
+    final userId = options?.userId;
+    final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}/un-flag'
       .replaceAll('{id}', id);
@@ -6759,8 +6568,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> unFlagComment(ApiUnFlagCommentRequest request,) async {
-    final response = await unFlagCommentWithHttpInfo(request,);
+  Future<FlagCommentResponse?> unFlagComment(String tenantId, String id, [ ApiUnFlagCommentOptions? options, ]) async {
+    final response = await unFlagCommentWithHttpInfo(tenantId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6788,13 +6597,10 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<Response> updateCommentWithHttpInfo(ApiUpdateCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updatableCommentParams = request.updatableCommentParams;
-    final contextUserId = request.contextUserId;
-    final doSpamCheck = request.doSpamCheck;
-    final isLive = request.isLive;
+  Future<Response> updateCommentWithHttpInfo(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options, ]) async {
+    final contextUserId = options?.contextUserId;
+    final doSpamCheck = options?.doSpamCheck;
+    final isLive = options?.isLive;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -6844,8 +6650,8 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<APIEmptyResponse?> updateComment(ApiUpdateCommentRequest request,) async {
-    final response = await updateCommentWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateComment(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options, ]) async {
+    final response = await updateCommentWithHttpInfo(tenantId, id, updatableCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6867,10 +6673,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateEmailTemplateBody] updateEmailTemplateBody (required):
-  Future<Response> updateEmailTemplateWithHttpInfo(ApiUpdateEmailTemplateRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateEmailTemplateBody = request.updateEmailTemplateBody;
+  Future<Response> updateEmailTemplateWithHttpInfo(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -6905,8 +6708,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateEmailTemplateBody] updateEmailTemplateBody (required):
-  Future<APIEmptyResponse?> updateEmailTemplate(ApiUpdateEmailTemplateRequest request,) async {
-    final response = await updateEmailTemplateWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateEmailTemplate(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody, ) async {
+    final response = await updateEmailTemplateWithHttpInfo(tenantId, id, updateEmailTemplateBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6928,10 +6731,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [FeedPost] feedPost (required):
-  Future<Response> updateFeedPostWithHttpInfo(ApiUpdateFeedPostRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final feedPost = request.feedPost;
+  Future<Response> updateFeedPostWithHttpInfo(String tenantId, String id, FeedPost feedPost, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts/{id}'
       .replaceAll('{id}', id);
@@ -6966,8 +6766,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [FeedPost] feedPost (required):
-  Future<APIEmptyResponse?> updateFeedPost(ApiUpdateFeedPostRequest request,) async {
-    final response = await updateFeedPostWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateFeedPost(String tenantId, String id, FeedPost feedPost, ) async {
+    final response = await updateFeedPostWithHttpInfo(tenantId, id, feedPost, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6989,10 +6789,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateModeratorBody] updateModeratorBody (required):
-  Future<Response> updateModeratorWithHttpInfo(ApiUpdateModeratorRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateModeratorBody = request.updateModeratorBody;
+  Future<Response> updateModeratorWithHttpInfo(String tenantId, String id, UpdateModeratorBody updateModeratorBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -7027,8 +6824,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateModeratorBody] updateModeratorBody (required):
-  Future<APIEmptyResponse?> updateModerator(ApiUpdateModeratorRequest request,) async {
-    final response = await updateModeratorWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateModerator(String tenantId, String id, UpdateModeratorBody updateModeratorBody, ) async {
+    final response = await updateModeratorWithHttpInfo(tenantId, id, updateModeratorBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7052,11 +6849,8 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<Response> updateNotificationWithHttpInfo(ApiUpdateNotificationRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateNotificationBody = request.updateNotificationBody;
-    final userId = request.userId;
+  Future<Response> updateNotificationWithHttpInfo(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ ApiUpdateNotificationOptions? options, ]) async {
+    final userId = options?.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications/{id}'
       .replaceAll('{id}', id);
@@ -7096,8 +6890,8 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<APIEmptyResponse?> updateNotification(ApiUpdateNotificationRequest request,) async {
-    final response = await updateNotificationWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateNotification(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ ApiUpdateNotificationOptions? options, ]) async {
+    final response = await updateNotificationWithHttpInfo(tenantId, id, updateNotificationBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7119,10 +6913,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionConfigBody] updateQuestionConfigBody (required):
-  Future<Response> updateQuestionConfigWithHttpInfo(ApiUpdateQuestionConfigRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateQuestionConfigBody = request.updateQuestionConfigBody;
+  Future<Response> updateQuestionConfigWithHttpInfo(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -7157,8 +6948,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionConfigBody] updateQuestionConfigBody (required):
-  Future<APIEmptyResponse?> updateQuestionConfig(ApiUpdateQuestionConfigRequest request,) async {
-    final response = await updateQuestionConfigWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateQuestionConfig(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody, ) async {
+    final response = await updateQuestionConfigWithHttpInfo(tenantId, id, updateQuestionConfigBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7180,10 +6971,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionResultBody] updateQuestionResultBody (required):
-  Future<Response> updateQuestionResultWithHttpInfo(ApiUpdateQuestionResultRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateQuestionResultBody = request.updateQuestionResultBody;
+  Future<Response> updateQuestionResultWithHttpInfo(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -7218,8 +7006,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionResultBody] updateQuestionResultBody (required):
-  Future<APIEmptyResponse?> updateQuestionResult(ApiUpdateQuestionResultRequest request,) async {
-    final response = await updateQuestionResultWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateQuestionResult(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody, ) async {
+    final response = await updateQuestionResultWithHttpInfo(tenantId, id, updateQuestionResultBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7243,11 +7031,8 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<Response> updateSubscriptionWithHttpInfo(ApiUpdateSubscriptionRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateAPIUserSubscriptionData = request.updateAPIUserSubscriptionData;
-    final userId = request.userId;
+  Future<Response> updateSubscriptionWithHttpInfo(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ ApiUpdateSubscriptionOptions? options, ]) async {
+    final userId = options?.userId;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -7287,8 +7072,8 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<UpdateSubscriptionAPIResponse?> updateSubscription(ApiUpdateSubscriptionRequest request,) async {
-    final response = await updateSubscriptionWithHttpInfo(request,);
+  Future<UpdateSubscriptionAPIResponse?> updateSubscription(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ ApiUpdateSubscriptionOptions? options, ]) async {
+    final response = await updateSubscriptionWithHttpInfo(tenantId, id, updateAPIUserSubscriptionData, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7310,10 +7095,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantBody] updateTenantBody (required):
-  Future<Response> updateTenantWithHttpInfo(ApiUpdateTenantRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateTenantBody = request.updateTenantBody;
+  Future<Response> updateTenantWithHttpInfo(String tenantId, String id, UpdateTenantBody updateTenantBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -7348,8 +7130,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantBody] updateTenantBody (required):
-  Future<APIEmptyResponse?> updateTenant(ApiUpdateTenantRequest request,) async {
-    final response = await updateTenantWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateTenant(String tenantId, String id, UpdateTenantBody updateTenantBody, ) async {
+    final response = await updateTenantWithHttpInfo(tenantId, id, updateTenantBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7371,10 +7153,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantPackageBody] updateTenantPackageBody (required):
-  Future<Response> updateTenantPackageWithHttpInfo(ApiUpdateTenantPackageRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateTenantPackageBody = request.updateTenantPackageBody;
+  Future<Response> updateTenantPackageWithHttpInfo(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -7409,8 +7188,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantPackageBody] updateTenantPackageBody (required):
-  Future<APIEmptyResponse?> updateTenantPackage(ApiUpdateTenantPackageRequest request,) async {
-    final response = await updateTenantPackageWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateTenantPackage(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody, ) async {
+    final response = await updateTenantPackageWithHttpInfo(tenantId, id, updateTenantPackageBody, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7434,11 +7213,8 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> updateTenantUserWithHttpInfo(ApiUpdateTenantUserRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateTenantUserBody = request.updateTenantUserBody;
-    final updateComments = request.updateComments;
+  Future<Response> updateTenantUserWithHttpInfo(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ ApiUpdateTenantUserOptions? options, ]) async {
+    final updateComments = options?.updateComments;
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -7478,8 +7254,8 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> updateTenantUser(ApiUpdateTenantUserRequest request,) async {
-    final response = await updateTenantUserWithHttpInfo(request,);
+  Future<APIEmptyResponse?> updateTenantUser(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ ApiUpdateTenantUserOptions? options, ]) async {
+    final response = await updateTenantUserWithHttpInfo(tenantId, id, updateTenantUserBody, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7501,10 +7277,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateUserBadgeParams] updateUserBadgeParams (required):
-  Future<Response> updateUserBadgeWithHttpInfo(ApiUpdateUserBadgeRequest request,) async {
-    final tenantId = request.tenantId;
-    final id = request.id;
-    final updateUserBadgeParams = request.updateUserBadgeParams;
+  Future<Response> updateUserBadgeWithHttpInfo(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams, ) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -7539,8 +7312,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateUserBadgeParams] updateUserBadgeParams (required):
-  Future<APIEmptySuccessResponse?> updateUserBadge(ApiUpdateUserBadgeRequest request,) async {
-    final response = await updateUserBadgeWithHttpInfo(request,);
+  Future<APIEmptySuccessResponse?> updateUserBadge(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams, ) async {
+    final response = await updateUserBadgeWithHttpInfo(tenantId, id, updateUserBadgeParams, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7555,74 +7328,35 @@ class DefaultApi {
   }
 }
 
-/// Request parameters for [DefaultApi.addDomainConfig].
-class ApiAddDomainConfigRequest {
-  const ApiAddDomainConfigRequest({
-    required this.tenantId,
-    required this.addDomainConfigParams,
-  });
-  final String tenantId;
-  final AddDomainConfigParams addDomainConfigParams;
-}
-
-/// Request parameters for [DefaultApi.addHashTag].
-class ApiAddHashTagRequest {
-  const ApiAddHashTagRequest({
+/// Optional parameters for [DefaultApi.addHashTag].
+class ApiAddHashTagOptions {
+  const ApiAddHashTagOptions({
     this.tenantId,
-    this.createHashTagBody,
   });
   final String? tenantId;
-  final CreateHashTagBody? createHashTagBody;
 }
 
-/// Request parameters for [DefaultApi.addHashTagsBulk].
-class ApiAddHashTagsBulkRequest {
-  const ApiAddHashTagsBulkRequest({
+/// Optional parameters for [DefaultApi.addHashTagsBulk].
+class ApiAddHashTagsBulkOptions {
+  const ApiAddHashTagsBulkOptions({
     this.tenantId,
-    this.bulkCreateHashTagsBody,
   });
   final String? tenantId;
-  final BulkCreateHashTagsBody? bulkCreateHashTagsBody;
-}
-
-/// Request parameters for [DefaultApi.addPage].
-class ApiAddPageRequest {
-  const ApiAddPageRequest({
-    required this.tenantId,
-    required this.createAPIPageData,
-  });
-  final String tenantId;
-  final CreateAPIPageData createAPIPageData;
 }
 
-/// Request parameters for [DefaultApi.addSSOUser].
-class ApiAddSSOUserRequest {
-  const ApiAddSSOUserRequest({
-    required this.tenantId,
-    required this.createAPISSOUserData,
-  });
-  final String tenantId;
-  final CreateAPISSOUserData createAPISSOUserData;
-}
-
-/// Request parameters for [DefaultApi.aggregate].
-class ApiAggregateRequest {
-  const ApiAggregateRequest({
-    required this.tenantId,
-    required this.aggregationRequest,
+/// Optional parameters for [DefaultApi.aggregate].
+class ApiAggregateOptions {
+  const ApiAggregateOptions({
     this.parentTenantId,
     this.includeStats,
   });
-  final String tenantId;
-  final AggregationRequest aggregationRequest;
   final String? parentTenantId;
   final bool? includeStats;
 }
 
-/// Request parameters for [DefaultApi.aggregateQuestionResults].
-class ApiAggregateQuestionResultsRequest {
-  const ApiAggregateQuestionResultsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.aggregateQuestionResults].
+class ApiAggregateQuestionResultsOptions {
+  const ApiAggregateQuestionResultsOptions({
     this.questionId,
     this.questionIds,
     this.urlId,
@@ -7630,7 +7364,6 @@ class ApiAggregateQuestionResultsRequest {
     this.startDate,
     this.forceRecalculate,
   });
-  final String tenantId;
   final String? questionId;
   final List<String>? questionIds;
   final String? urlId;
@@ -7639,52 +7372,27 @@ class ApiAggregateQuestionResultsRequest {
   final bool? forceRecalculate;
 }
 
-/// Request parameters for [DefaultApi.blockUserFromComment].
-class ApiBlockUserFromCommentRequest {
-  const ApiBlockUserFromCommentRequest({
-    required this.tenantId,
-    required this.id,
-    required this.blockFromCommentParams,
+/// Optional parameters for [DefaultApi.blockUserFromComment].
+class ApiBlockUserFromCommentOptions {
+  const ApiBlockUserFromCommentOptions({
     this.userId,
     this.anonUserId,
   });
-  final String tenantId;
-  final String id;
-  final BlockFromCommentParams blockFromCommentParams;
   final String? userId;
   final String? anonUserId;
 }
 
-/// Request parameters for [DefaultApi.bulkAggregateQuestionResults].
-class ApiBulkAggregateQuestionResultsRequest {
-  const ApiBulkAggregateQuestionResultsRequest({
-    required this.tenantId,
-    required this.bulkAggregateQuestionResultsRequest,
+/// Optional parameters for [DefaultApi.bulkAggregateQuestionResults].
+class ApiBulkAggregateQuestionResultsOptions {
+  const ApiBulkAggregateQuestionResultsOptions({
     this.forceRecalculate,
   });
-  final String tenantId;
-  final BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest;
   final bool? forceRecalculate;
 }
 
-/// Request parameters for [DefaultApi.changeTicketState].
-class ApiChangeTicketStateRequest {
-  const ApiChangeTicketStateRequest({
-    required this.tenantId,
-    required this.userId,
-    required this.id,
-    required this.changeTicketStateBody,
-  });
-  final String tenantId;
-  final String userId;
-  final String id;
-  final ChangeTicketStateBody changeTicketStateBody;
-}
-
-/// Request parameters for [DefaultApi.combineCommentsWithQuestionResults].
-class ApiCombineCommentsWithQuestionResultsRequest {
-  const ApiCombineCommentsWithQuestionResultsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.combineCommentsWithQuestionResults].
+class ApiCombineCommentsWithQuestionResultsOptions {
+  const ApiCombineCommentsWithQuestionResultsOptions({
     this.questionId,
     this.questionIds,
     this.urlId,
@@ -7694,7 +7402,6 @@ class ApiCombineCommentsWithQuestionResultsRequest {
     this.maxValue,
     this.limit,
   });
-  final String tenantId;
   final String? questionId;
   final List<String>? questionIds;
   final String? urlId;
@@ -7705,371 +7412,119 @@ class ApiCombineCommentsWithQuestionResultsRequest {
   final double? limit;
 }
 
-/// Request parameters for [DefaultApi.createEmailTemplate].
-class ApiCreateEmailTemplateRequest {
-  const ApiCreateEmailTemplateRequest({
-    required this.tenantId,
-    required this.createEmailTemplateBody,
-  });
-  final String tenantId;
-  final CreateEmailTemplateBody createEmailTemplateBody;
-}
-
-/// Request parameters for [DefaultApi.createFeedPost].
-class ApiCreateFeedPostRequest {
-  const ApiCreateFeedPostRequest({
-    required this.tenantId,
-    required this.createFeedPostParams,
+/// Optional parameters for [DefaultApi.createFeedPost].
+class ApiCreateFeedPostOptions {
+  const ApiCreateFeedPostOptions({
     this.broadcastId,
     this.isLive,
     this.doSpamCheck,
     this.skipDupCheck,
   });
-  final String tenantId;
-  final CreateFeedPostParams createFeedPostParams;
   final String? broadcastId;
   final bool? isLive;
   final bool? doSpamCheck;
   final bool? skipDupCheck;
 }
 
-/// Request parameters for [DefaultApi.createModerator].
-class ApiCreateModeratorRequest {
-  const ApiCreateModeratorRequest({
-    required this.tenantId,
-    required this.createModeratorBody,
-  });
-  final String tenantId;
-  final CreateModeratorBody createModeratorBody;
-}
-
-/// Request parameters for [DefaultApi.createQuestionConfig].
-class ApiCreateQuestionConfigRequest {
-  const ApiCreateQuestionConfigRequest({
-    required this.tenantId,
-    required this.createQuestionConfigBody,
-  });
-  final String tenantId;
-  final CreateQuestionConfigBody createQuestionConfigBody;
-}
-
-/// Request parameters for [DefaultApi.createQuestionResult].
-class ApiCreateQuestionResultRequest {
-  const ApiCreateQuestionResultRequest({
-    required this.tenantId,
-    required this.createQuestionResultBody,
-  });
-  final String tenantId;
-  final CreateQuestionResultBody createQuestionResultBody;
-}
-
-/// Request parameters for [DefaultApi.createSubscription].
-class ApiCreateSubscriptionRequest {
-  const ApiCreateSubscriptionRequest({
-    required this.tenantId,
-    required this.createAPIUserSubscriptionData,
-  });
-  final String tenantId;
-  final CreateAPIUserSubscriptionData createAPIUserSubscriptionData;
-}
-
-/// Request parameters for [DefaultApi.createTenant].
-class ApiCreateTenantRequest {
-  const ApiCreateTenantRequest({
-    required this.tenantId,
-    required this.createTenantBody,
-  });
-  final String tenantId;
-  final CreateTenantBody createTenantBody;
-}
-
-/// Request parameters for [DefaultApi.createTenantPackage].
-class ApiCreateTenantPackageRequest {
-  const ApiCreateTenantPackageRequest({
-    required this.tenantId,
-    required this.createTenantPackageBody,
-  });
-  final String tenantId;
-  final CreateTenantPackageBody createTenantPackageBody;
-}
-
-/// Request parameters for [DefaultApi.createTenantUser].
-class ApiCreateTenantUserRequest {
-  const ApiCreateTenantUserRequest({
-    required this.tenantId,
-    required this.createTenantUserBody,
-  });
-  final String tenantId;
-  final CreateTenantUserBody createTenantUserBody;
-}
-
-/// Request parameters for [DefaultApi.createTicket].
-class ApiCreateTicketRequest {
-  const ApiCreateTicketRequest({
-    required this.tenantId,
-    required this.userId,
-    required this.createTicketBody,
-  });
-  final String tenantId;
-  final String userId;
-  final CreateTicketBody createTicketBody;
-}
-
-/// Request parameters for [DefaultApi.createUserBadge].
-class ApiCreateUserBadgeRequest {
-  const ApiCreateUserBadgeRequest({
-    required this.tenantId,
-    required this.createUserBadgeParams,
-  });
-  final String tenantId;
-  final CreateUserBadgeParams createUserBadgeParams;
-}
-
-/// Request parameters for [DefaultApi.createVote].
-class ApiCreateVoteRequest {
-  const ApiCreateVoteRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.direction,
+/// Optional parameters for [DefaultApi.createVote].
+class ApiCreateVoteOptions {
+  const ApiCreateVoteOptions({
     this.userId,
     this.anonUserId,
   });
-  final String tenantId;
-  final String commentId;
-  final String direction;
   final String? userId;
   final String? anonUserId;
 }
 
-/// Request parameters for [DefaultApi.deleteComment].
-class ApiDeleteCommentRequest {
-  const ApiDeleteCommentRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteComment].
+class ApiDeleteCommentOptions {
+  const ApiDeleteCommentOptions({
     this.contextUserId,
     this.isLive,
   });
-  final String tenantId;
-  final String id;
   final String? contextUserId;
   final bool? isLive;
 }
 
-/// Request parameters for [DefaultApi.deleteDomainConfig].
-class ApiDeleteDomainConfigRequest {
-  const ApiDeleteDomainConfigRequest({
-    required this.tenantId,
-    required this.domain,
-  });
-  final String tenantId;
-  final String domain;
-}
-
-/// Request parameters for [DefaultApi.deleteEmailTemplate].
-class ApiDeleteEmailTemplateRequest {
-  const ApiDeleteEmailTemplateRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deleteEmailTemplateRenderError].
-class ApiDeleteEmailTemplateRenderErrorRequest {
-  const ApiDeleteEmailTemplateRenderErrorRequest({
-    required this.tenantId,
-    required this.id,
-    required this.errorId,
-  });
-  final String tenantId;
-  final String id;
-  final String errorId;
-}
-
-/// Request parameters for [DefaultApi.deleteHashTag].
-class ApiDeleteHashTagRequest {
-  const ApiDeleteHashTagRequest({
-    required this.tag,
+/// Optional parameters for [DefaultApi.deleteHashTag].
+class ApiDeleteHashTagOptions {
+  const ApiDeleteHashTagOptions({
     this.tenantId,
-    this.deleteHashTagRequestBody,
   });
-  final String tag;
   final String? tenantId;
-  final DeleteHashTagRequestBody? deleteHashTagRequestBody;
 }
 
-/// Request parameters for [DefaultApi.deleteModerator].
-class ApiDeleteModeratorRequest {
-  const ApiDeleteModeratorRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteModerator].
+class ApiDeleteModeratorOptions {
+  const ApiDeleteModeratorOptions({
     this.sendEmail,
   });
-  final String tenantId;
-  final String id;
   final String? sendEmail;
 }
 
-/// Request parameters for [DefaultApi.deleteNotificationCount].
-class ApiDeleteNotificationCountRequest {
-  const ApiDeleteNotificationCountRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deletePage].
-class ApiDeletePageRequest {
-  const ApiDeletePageRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deletePendingWebhookEvent].
-class ApiDeletePendingWebhookEventRequest {
-  const ApiDeletePendingWebhookEventRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deleteQuestionConfig].
-class ApiDeleteQuestionConfigRequest {
-  const ApiDeleteQuestionConfigRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deleteQuestionResult].
-class ApiDeleteQuestionResultRequest {
-  const ApiDeleteQuestionResultRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deleteSSOUser].
-class ApiDeleteSSOUserRequest {
-  const ApiDeleteSSOUserRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteSSOUser].
+class ApiDeleteSSOUserOptions {
+  const ApiDeleteSSOUserOptions({
     this.deleteComments,
     this.commentDeleteMode,
   });
-  final String tenantId;
-  final String id;
   final bool? deleteComments;
   final String? commentDeleteMode;
 }
 
-/// Request parameters for [DefaultApi.deleteSubscription].
-class ApiDeleteSubscriptionRequest {
-  const ApiDeleteSubscriptionRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteSubscription].
+class ApiDeleteSubscriptionOptions {
+  const ApiDeleteSubscriptionOptions({
     this.userId,
   });
-  final String tenantId;
-  final String id;
   final String? userId;
 }
 
-/// Request parameters for [DefaultApi.deleteTenant].
-class ApiDeleteTenantRequest {
-  const ApiDeleteTenantRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteTenant].
+class ApiDeleteTenantOptions {
+  const ApiDeleteTenantOptions({
     this.sure,
   });
-  final String tenantId;
-  final String id;
   final String? sure;
 }
 
-/// Request parameters for [DefaultApi.deleteTenantPackage].
-class ApiDeleteTenantPackageRequest {
-  const ApiDeleteTenantPackageRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deleteTenantUser].
-class ApiDeleteTenantUserRequest {
-  const ApiDeleteTenantUserRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteTenantUser].
+class ApiDeleteTenantUserOptions {
+  const ApiDeleteTenantUserOptions({
     this.deleteComments,
     this.commentDeleteMode,
   });
-  final String tenantId;
-  final String id;
   final String? deleteComments;
   final String? commentDeleteMode;
 }
 
-/// Request parameters for [DefaultApi.deleteUserBadge].
-class ApiDeleteUserBadgeRequest {
-  const ApiDeleteUserBadgeRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.deleteVote].
-class ApiDeleteVoteRequest {
-  const ApiDeleteVoteRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.deleteVote].
+class ApiDeleteVoteOptions {
+  const ApiDeleteVoteOptions({
     this.editKey,
   });
-  final String tenantId;
-  final String id;
   final String? editKey;
 }
 
-/// Request parameters for [DefaultApi.flagComment].
-class ApiFlagCommentRequest {
-  const ApiFlagCommentRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.flagComment].
+class ApiFlagCommentOptions {
+  const ApiFlagCommentOptions({
     this.userId,
     this.anonUserId,
   });
-  final String tenantId;
-  final String id;
   final String? userId;
   final String? anonUserId;
 }
 
-/// Request parameters for [DefaultApi.getAuditLogs].
-class ApiGetAuditLogsRequest {
-  const ApiGetAuditLogsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getAuditLogs].
+class ApiGetAuditLogsOptions {
+  const ApiGetAuditLogsOptions({
     this.limit,
     this.skip,
     this.order,
     this.after,
     this.before,
   });
-  final String tenantId;
   final double? limit;
   final double? skip;
   final SORTDIR? order;
@@ -8077,30 +7532,9 @@ class ApiGetAuditLogsRequest {
   final double? before;
 }
 
-/// Request parameters for [DefaultApi.getCachedNotificationCount].
-class ApiGetCachedNotificationCountRequest {
-  const ApiGetCachedNotificationCountRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getComment].
-class ApiGetCommentRequest {
-  const ApiGetCommentRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getComments].
-class ApiGetCommentsRequest {
-  const ApiGetCommentsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getComments].
+class ApiGetCommentsOptions {
+  const ApiGetCommentsOptions({
     this.page,
     this.limit,
     this.skip,
@@ -8118,7 +7552,6 @@ class ApiGetCommentsRequest {
     this.fromDate,
     this.toDate,
   });
-  final String tenantId;
   final int? page;
   final int? limit;
   final int? skip;
@@ -8137,119 +7570,59 @@ class ApiGetCommentsRequest {
   final int? toDate;
 }
 
-/// Request parameters for [DefaultApi.getDomainConfig].
-class ApiGetDomainConfigRequest {
-  const ApiGetDomainConfigRequest({
-    required this.tenantId,
-    required this.domain,
-  });
-  final String tenantId;
-  final String domain;
-}
-
-/// Request parameters for [DefaultApi.getDomainConfigs].
-class ApiGetDomainConfigsRequest {
-  const ApiGetDomainConfigsRequest({
-    required this.tenantId,
-  });
-  final String tenantId;
-}
-
-/// Request parameters for [DefaultApi.getEmailTemplate].
-class ApiGetEmailTemplateRequest {
-  const ApiGetEmailTemplateRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getEmailTemplateDefinitions].
-class ApiGetEmailTemplateDefinitionsRequest {
-  const ApiGetEmailTemplateDefinitionsRequest({
-    required this.tenantId,
-  });
-  final String tenantId;
-}
-
-/// Request parameters for [DefaultApi.getEmailTemplateRenderErrors].
-class ApiGetEmailTemplateRenderErrorsRequest {
-  const ApiGetEmailTemplateRenderErrorsRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.getEmailTemplateRenderErrors].
+class ApiGetEmailTemplateRenderErrorsOptions {
+  const ApiGetEmailTemplateRenderErrorsOptions({
     this.skip,
   });
-  final String tenantId;
-  final String id;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getEmailTemplates].
-class ApiGetEmailTemplatesRequest {
-  const ApiGetEmailTemplatesRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getEmailTemplates].
+class ApiGetEmailTemplatesOptions {
+  const ApiGetEmailTemplatesOptions({
     this.skip,
   });
-  final String tenantId;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getFeedPosts].
-class ApiGetFeedPostsRequest {
-  const ApiGetFeedPostsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getFeedPosts].
+class ApiGetFeedPostsOptions {
+  const ApiGetFeedPostsOptions({
     this.afterId,
     this.limit,
     this.tags,
   });
-  final String tenantId;
   final String? afterId;
   final int? limit;
   final List<String>? tags;
 }
 
-/// Request parameters for [DefaultApi.getHashTags].
-class ApiGetHashTagsRequest {
-  const ApiGetHashTagsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getHashTags].
+class ApiGetHashTagsOptions {
+  const ApiGetHashTagsOptions({
     this.page,
   });
-  final String tenantId;
   final double? page;
 }
 
-/// Request parameters for [DefaultApi.getModerator].
-class ApiGetModeratorRequest {
-  const ApiGetModeratorRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getModerators].
-class ApiGetModeratorsRequest {
-  const ApiGetModeratorsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getModerators].
+class ApiGetModeratorsOptions {
+  const ApiGetModeratorsOptions({
     this.skip,
   });
-  final String tenantId;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getNotificationCount].
-class ApiGetNotificationCountRequest {
-  const ApiGetNotificationCountRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getNotificationCount].
+class ApiGetNotificationCountOptions {
+  const ApiGetNotificationCountOptions({
     this.userId,
     this.urlId,
     this.fromCommentId,
     this.viewed,
     this.type,
   });
-  final String tenantId;
   final String? userId;
   final String? urlId;
   final String? fromCommentId;
@@ -8257,10 +7630,9 @@ class ApiGetNotificationCountRequest {
   final String? type;
 }
 
-/// Request parameters for [DefaultApi.getNotifications].
-class ApiGetNotificationsRequest {
-  const ApiGetNotificationsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getNotifications].
+class ApiGetNotificationsOptions {
+  const ApiGetNotificationsOptions({
     this.userId,
     this.urlId,
     this.fromCommentId,
@@ -8268,7 +7640,6 @@ class ApiGetNotificationsRequest {
     this.type,
     this.skip,
   });
-  final String tenantId;
   final String? userId;
   final String? urlId;
   final String? fromCommentId;
@@ -8277,28 +7648,9 @@ class ApiGetNotificationsRequest {
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getPageByURLId].
-class ApiGetPageByURLIdRequest {
-  const ApiGetPageByURLIdRequest({
-    required this.tenantId,
-    required this.urlId,
-  });
-  final String tenantId;
-  final String urlId;
-}
-
-/// Request parameters for [DefaultApi.getPages].
-class ApiGetPagesRequest {
-  const ApiGetPagesRequest({
-    required this.tenantId,
-  });
-  final String tenantId;
-}
-
-/// Request parameters for [DefaultApi.getPendingWebhookEventCount].
-class ApiGetPendingWebhookEventCountRequest {
-  const ApiGetPendingWebhookEventCountRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getPendingWebhookEventCount].
+class ApiGetPendingWebhookEventCountOptions {
+  const ApiGetPendingWebhookEventCountOptions({
     this.commentId,
     this.externalId,
     this.eventType,
@@ -8306,7 +7658,6 @@ class ApiGetPendingWebhookEventCountRequest {
     this.domain,
     this.attemptCountGT,
   });
-  final String tenantId;
   final String? commentId;
   final String? externalId;
   final String? eventType;
@@ -8315,10 +7666,9 @@ class ApiGetPendingWebhookEventCountRequest {
   final double? attemptCountGT;
 }
 
-/// Request parameters for [DefaultApi.getPendingWebhookEvents].
-class ApiGetPendingWebhookEventsRequest {
-  const ApiGetPendingWebhookEventsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getPendingWebhookEvents].
+class ApiGetPendingWebhookEventsOptions {
+  const ApiGetPendingWebhookEventsOptions({
     this.commentId,
     this.externalId,
     this.eventType,
@@ -8327,7 +7677,6 @@ class ApiGetPendingWebhookEventsRequest {
     this.attemptCountGT,
     this.skip,
   });
-  final String tenantId;
   final String? commentId;
   final String? externalId;
   final String? eventType;
@@ -8337,40 +7686,17 @@ class ApiGetPendingWebhookEventsRequest {
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getQuestionConfig].
-class ApiGetQuestionConfigRequest {
-  const ApiGetQuestionConfigRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getQuestionConfigs].
-class ApiGetQuestionConfigsRequest {
-  const ApiGetQuestionConfigsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getQuestionConfigs].
+class ApiGetQuestionConfigsOptions {
+  const ApiGetQuestionConfigsOptions({
     this.skip,
   });
-  final String tenantId;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getQuestionResult].
-class ApiGetQuestionResultRequest {
-  const ApiGetQuestionResultRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getQuestionResults].
-class ApiGetQuestionResultsRequest {
-  const ApiGetQuestionResultsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getQuestionResults].
+class ApiGetQuestionResultsOptions {
+  const ApiGetQuestionResultsOptions({
     this.urlId,
     this.userId,
     this.startDate,
@@ -8378,7 +7704,6 @@ class ApiGetQuestionResultsRequest {
     this.questionIds,
     this.skip,
   });
-  final String tenantId;
   final String? urlId;
   final String? userId;
   final String? startDate;
@@ -8387,210 +7712,99 @@ class ApiGetQuestionResultsRequest {
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getSSOUserByEmail].
-class ApiGetSSOUserByEmailRequest {
-  const ApiGetSSOUserByEmailRequest({
-    required this.tenantId,
-    required this.email,
-  });
-  final String tenantId;
-  final String email;
-}
-
-/// Request parameters for [DefaultApi.getSSOUserById].
-class ApiGetSSOUserByIdRequest {
-  const ApiGetSSOUserByIdRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getSSOUsers].
-class ApiGetSSOUsersRequest {
-  const ApiGetSSOUsersRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getSSOUsers].
+class ApiGetSSOUsersOptions {
+  const ApiGetSSOUsersOptions({
     this.skip,
   });
-  final String tenantId;
   final int? skip;
 }
 
-/// Request parameters for [DefaultApi.getSubscriptions].
-class ApiGetSubscriptionsRequest {
-  const ApiGetSubscriptionsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getSubscriptions].
+class ApiGetSubscriptionsOptions {
+  const ApiGetSubscriptionsOptions({
     this.userId,
   });
-  final String tenantId;
   final String? userId;
 }
 
-/// Request parameters for [DefaultApi.getTenant].
-class ApiGetTenantRequest {
-  const ApiGetTenantRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getTenantDailyUsages].
-class ApiGetTenantDailyUsagesRequest {
-  const ApiGetTenantDailyUsagesRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getTenantDailyUsages].
+class ApiGetTenantDailyUsagesOptions {
+  const ApiGetTenantDailyUsagesOptions({
     this.yearNumber,
     this.monthNumber,
     this.dayNumber,
     this.skip,
   });
-  final String tenantId;
   final double? yearNumber;
   final double? monthNumber;
   final double? dayNumber;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getTenantPackage].
-class ApiGetTenantPackageRequest {
-  const ApiGetTenantPackageRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getTenantPackages].
-class ApiGetTenantPackagesRequest {
-  const ApiGetTenantPackagesRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getTenantPackages].
+class ApiGetTenantPackagesOptions {
+  const ApiGetTenantPackagesOptions({
     this.skip,
   });
-  final String tenantId;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getTenantUser].
-class ApiGetTenantUserRequest {
-  const ApiGetTenantUserRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getTenantUsers].
-class ApiGetTenantUsersRequest {
-  const ApiGetTenantUsersRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getTenantUsers].
+class ApiGetTenantUsersOptions {
+  const ApiGetTenantUsersOptions({
     this.skip,
   });
-  final String tenantId;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getTenants].
-class ApiGetTenantsRequest {
-  const ApiGetTenantsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getTenants].
+class ApiGetTenantsOptions {
+  const ApiGetTenantsOptions({
     this.meta,
     this.skip,
   });
-  final String tenantId;
   final String? meta;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getTicket].
-class ApiGetTicketRequest {
-  const ApiGetTicketRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.getTicket].
+class ApiGetTicketOptions {
+  const ApiGetTicketOptions({
     this.userId,
   });
-  final String tenantId;
-  final String id;
   final String? userId;
 }
 
-/// Request parameters for [DefaultApi.getTickets].
-class ApiGetTicketsRequest {
-  const ApiGetTicketsRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getTickets].
+class ApiGetTicketsOptions {
+  const ApiGetTicketsOptions({
     this.userId,
     this.state,
     this.skip,
     this.limit,
   });
-  final String tenantId;
   final String? userId;
   final double? state;
   final double? skip;
   final double? limit;
 }
 
-/// Request parameters for [DefaultApi.getUser].
-class ApiGetUserRequest {
-  const ApiGetUserRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getUserBadge].
-class ApiGetUserBadgeRequest {
-  const ApiGetUserBadgeRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getUserBadgeProgressById].
-class ApiGetUserBadgeProgressByIdRequest {
-  const ApiGetUserBadgeProgressByIdRequest({
-    required this.tenantId,
-    required this.id,
-  });
-  final String tenantId;
-  final String id;
-}
-
-/// Request parameters for [DefaultApi.getUserBadgeProgressByUserId].
-class ApiGetUserBadgeProgressByUserIdRequest {
-  const ApiGetUserBadgeProgressByUserIdRequest({
-    required this.tenantId,
-    required this.userId,
-  });
-  final String tenantId;
-  final String userId;
-}
-
-/// Request parameters for [DefaultApi.getUserBadgeProgressList].
-class ApiGetUserBadgeProgressListRequest {
-  const ApiGetUserBadgeProgressListRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getUserBadgeProgressList].
+class ApiGetUserBadgeProgressListOptions {
+  const ApiGetUserBadgeProgressListOptions({
     this.userId,
     this.limit,
     this.skip,
   });
-  final String tenantId;
   final String? userId;
   final double? limit;
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getUserBadges].
-class ApiGetUserBadgesRequest {
-  const ApiGetUserBadgesRequest({
-    required this.tenantId,
+/// Optional parameters for [DefaultApi.getUserBadges].
+class ApiGetUserBadgesOptions {
+  const ApiGetUserBadgesOptions({
     this.userId,
     this.badgeId,
     this.type,
@@ -8598,7 +7812,6 @@ class ApiGetUserBadgesRequest {
     this.limit,
     this.skip,
   });
-  final String tenantId;
   final String? userId;
   final String? badgeId;
   final double? type;
@@ -8607,386 +7820,144 @@ class ApiGetUserBadgesRequest {
   final double? skip;
 }
 
-/// Request parameters for [DefaultApi.getVotes].
-class ApiGetVotesRequest {
-  const ApiGetVotesRequest({
-    required this.tenantId,
-    required this.urlId,
-  });
-  final String tenantId;
-  final String urlId;
-}
-
-/// Request parameters for [DefaultApi.getVotesForUser].
-class ApiGetVotesForUserRequest {
-  const ApiGetVotesForUserRequest({
-    required this.tenantId,
-    required this.urlId,
+/// Optional parameters for [DefaultApi.getVotesForUser].
+class ApiGetVotesForUserOptions {
+  const ApiGetVotesForUserOptions({
     this.userId,
     this.anonUserId,
   });
-  final String tenantId;
-  final String urlId;
   final String? userId;
   final String? anonUserId;
 }
 
-/// Request parameters for [DefaultApi.patchDomainConfig].
-class ApiPatchDomainConfigRequest {
-  const ApiPatchDomainConfigRequest({
-    required this.tenantId,
-    required this.domainToUpdate,
-    required this.patchDomainConfigParams,
-  });
-  final String tenantId;
-  final String domainToUpdate;
-  final PatchDomainConfigParams patchDomainConfigParams;
-}
-
-/// Request parameters for [DefaultApi.patchHashTag].
-class ApiPatchHashTagRequest {
-  const ApiPatchHashTagRequest({
-    required this.tag,
+/// Optional parameters for [DefaultApi.patchHashTag].
+class ApiPatchHashTagOptions {
+  const ApiPatchHashTagOptions({
     this.tenantId,
-    this.updateHashTagBody,
   });
-  final String tag;
   final String? tenantId;
-  final UpdateHashTagBody? updateHashTagBody;
 }
 
-/// Request parameters for [DefaultApi.patchPage].
-class ApiPatchPageRequest {
-  const ApiPatchPageRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateAPIPageData,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateAPIPageData updateAPIPageData;
-}
-
-/// Request parameters for [DefaultApi.patchSSOUser].
-class ApiPatchSSOUserRequest {
-  const ApiPatchSSOUserRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateAPISSOUserData,
+/// Optional parameters for [DefaultApi.patchSSOUser].
+class ApiPatchSSOUserOptions {
+  const ApiPatchSSOUserOptions({
     this.updateComments,
   });
-  final String tenantId;
-  final String id;
-  final UpdateAPISSOUserData updateAPISSOUserData;
   final bool? updateComments;
 }
 
-/// Request parameters for [DefaultApi.putDomainConfig].
-class ApiPutDomainConfigRequest {
-  const ApiPutDomainConfigRequest({
-    required this.tenantId,
-    required this.domainToUpdate,
-    required this.updateDomainConfigParams,
-  });
-  final String tenantId;
-  final String domainToUpdate;
-  final UpdateDomainConfigParams updateDomainConfigParams;
-}
-
-/// Request parameters for [DefaultApi.putSSOUser].
-class ApiPutSSOUserRequest {
-  const ApiPutSSOUserRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateAPISSOUserData,
+/// Optional parameters for [DefaultApi.putSSOUser].
+class ApiPutSSOUserOptions {
+  const ApiPutSSOUserOptions({
     this.updateComments,
   });
-  final String tenantId;
-  final String id;
-  final UpdateAPISSOUserData updateAPISSOUserData;
   final bool? updateComments;
 }
 
-/// Request parameters for [DefaultApi.renderEmailTemplate].
-class ApiRenderEmailTemplateRequest {
-  const ApiRenderEmailTemplateRequest({
-    required this.tenantId,
-    required this.renderEmailTemplateBody,
+/// Optional parameters for [DefaultApi.renderEmailTemplate].
+class ApiRenderEmailTemplateOptions {
+  const ApiRenderEmailTemplateOptions({
     this.locale,
   });
-  final String tenantId;
-  final RenderEmailTemplateBody renderEmailTemplateBody;
   final String? locale;
 }
 
-/// Request parameters for [DefaultApi.replaceTenantPackage].
-class ApiReplaceTenantPackageRequest {
-  const ApiReplaceTenantPackageRequest({
-    required this.tenantId,
-    required this.id,
-    required this.replaceTenantPackageBody,
-  });
-  final String tenantId;
-  final String id;
-  final ReplaceTenantPackageBody replaceTenantPackageBody;
-}
-
-/// Request parameters for [DefaultApi.replaceTenantUser].
-class ApiReplaceTenantUserRequest {
-  const ApiReplaceTenantUserRequest({
-    required this.tenantId,
-    required this.id,
-    required this.replaceTenantUserBody,
+/// Optional parameters for [DefaultApi.replaceTenantUser].
+class ApiReplaceTenantUserOptions {
+  const ApiReplaceTenantUserOptions({
     this.updateComments,
   });
-  final String tenantId;
-  final String id;
-  final ReplaceTenantUserBody replaceTenantUserBody;
   final String? updateComments;
 }
 
-/// Request parameters for [DefaultApi.saveComment].
-class ApiSaveCommentRequest {
-  const ApiSaveCommentRequest({
-    required this.tenantId,
-    required this.createCommentParams,
+/// Optional parameters for [DefaultApi.saveComment].
+class ApiSaveCommentOptions {
+  const ApiSaveCommentOptions({
     this.isLive,
     this.doSpamCheck,
     this.sendEmails,
     this.populateNotifications,
   });
-  final String tenantId;
-  final CreateCommentParams createCommentParams;
   final bool? isLive;
   final bool? doSpamCheck;
   final bool? sendEmails;
   final bool? populateNotifications;
 }
 
-/// Request parameters for [DefaultApi.saveCommentsBulk].
-class ApiSaveCommentsBulkRequest {
-  const ApiSaveCommentsBulkRequest({
-    required this.tenantId,
-    required this.createCommentParams,
+/// Optional parameters for [DefaultApi.saveCommentsBulk].
+class ApiSaveCommentsBulkOptions {
+  const ApiSaveCommentsBulkOptions({
     this.isLive,
     this.doSpamCheck,
     this.sendEmails,
     this.populateNotifications,
   });
-  final String tenantId;
-  final List<CreateCommentParams> createCommentParams;
   final bool? isLive;
   final bool? doSpamCheck;
   final bool? sendEmails;
   final bool? populateNotifications;
 }
 
-/// Request parameters for [DefaultApi.sendInvite].
-class ApiSendInviteRequest {
-  const ApiSendInviteRequest({
-    required this.tenantId,
-    required this.id,
-    required this.fromName,
-  });
-  final String tenantId;
-  final String id;
-  final String fromName;
-}
-
-/// Request parameters for [DefaultApi.sendLoginLink].
-class ApiSendLoginLinkRequest {
-  const ApiSendLoginLinkRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.sendLoginLink].
+class ApiSendLoginLinkOptions {
+  const ApiSendLoginLinkOptions({
     this.redirectURL,
   });
-  final String tenantId;
-  final String id;
   final String? redirectURL;
 }
 
-/// Request parameters for [DefaultApi.unBlockUserFromComment].
-class ApiUnBlockUserFromCommentRequest {
-  const ApiUnBlockUserFromCommentRequest({
-    required this.tenantId,
-    required this.id,
-    required this.unBlockFromCommentParams,
+/// Optional parameters for [DefaultApi.unBlockUserFromComment].
+class ApiUnBlockUserFromCommentOptions {
+  const ApiUnBlockUserFromCommentOptions({
     this.userId,
     this.anonUserId,
   });
-  final String tenantId;
-  final String id;
-  final UnBlockFromCommentParams unBlockFromCommentParams;
   final String? userId;
   final String? anonUserId;
 }
 
-/// Request parameters for [DefaultApi.unFlagComment].
-class ApiUnFlagCommentRequest {
-  const ApiUnFlagCommentRequest({
-    required this.tenantId,
-    required this.id,
+/// Optional parameters for [DefaultApi.unFlagComment].
+class ApiUnFlagCommentOptions {
+  const ApiUnFlagCommentOptions({
     this.userId,
     this.anonUserId,
   });
-  final String tenantId;
-  final String id;
   final String? userId;
   final String? anonUserId;
 }
 
-/// Request parameters for [DefaultApi.updateComment].
-class ApiUpdateCommentRequest {
-  const ApiUpdateCommentRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updatableCommentParams,
+/// Optional parameters for [DefaultApi.updateComment].
+class ApiUpdateCommentOptions {
+  const ApiUpdateCommentOptions({
     this.contextUserId,
     this.doSpamCheck,
     this.isLive,
   });
-  final String tenantId;
-  final String id;
-  final UpdatableCommentParams updatableCommentParams;
   final String? contextUserId;
   final bool? doSpamCheck;
   final bool? isLive;
 }
 
-/// Request parameters for [DefaultApi.updateEmailTemplate].
-class ApiUpdateEmailTemplateRequest {
-  const ApiUpdateEmailTemplateRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateEmailTemplateBody,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateEmailTemplateBody updateEmailTemplateBody;
-}
-
-/// Request parameters for [DefaultApi.updateFeedPost].
-class ApiUpdateFeedPostRequest {
-  const ApiUpdateFeedPostRequest({
-    required this.tenantId,
-    required this.id,
-    required this.feedPost,
-  });
-  final String tenantId;
-  final String id;
-  final FeedPost feedPost;
-}
-
-/// Request parameters for [DefaultApi.updateModerator].
-class ApiUpdateModeratorRequest {
-  const ApiUpdateModeratorRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateModeratorBody,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateModeratorBody updateModeratorBody;
-}
-
-/// Request parameters for [DefaultApi.updateNotification].
-class ApiUpdateNotificationRequest {
-  const ApiUpdateNotificationRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateNotificationBody,
+/// Optional parameters for [DefaultApi.updateNotification].
+class ApiUpdateNotificationOptions {
+  const ApiUpdateNotificationOptions({
     this.userId,
   });
-  final String tenantId;
-  final String id;
-  final UpdateNotificationBody updateNotificationBody;
   final String? userId;
 }
 
-/// Request parameters for [DefaultApi.updateQuestionConfig].
-class ApiUpdateQuestionConfigRequest {
-  const ApiUpdateQuestionConfigRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateQuestionConfigBody,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateQuestionConfigBody updateQuestionConfigBody;
-}
-
-/// Request parameters for [DefaultApi.updateQuestionResult].
-class ApiUpdateQuestionResultRequest {
-  const ApiUpdateQuestionResultRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateQuestionResultBody,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateQuestionResultBody updateQuestionResultBody;
-}
-
-/// Request parameters for [DefaultApi.updateSubscription].
-class ApiUpdateSubscriptionRequest {
-  const ApiUpdateSubscriptionRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateAPIUserSubscriptionData,
+/// Optional parameters for [DefaultApi.updateSubscription].
+class ApiUpdateSubscriptionOptions {
+  const ApiUpdateSubscriptionOptions({
     this.userId,
   });
-  final String tenantId;
-  final String id;
-  final UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData;
   final String? userId;
 }
 
-/// Request parameters for [DefaultApi.updateTenant].
-class ApiUpdateTenantRequest {
-  const ApiUpdateTenantRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateTenantBody,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateTenantBody updateTenantBody;
-}
-
-/// Request parameters for [DefaultApi.updateTenantPackage].
-class ApiUpdateTenantPackageRequest {
-  const ApiUpdateTenantPackageRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateTenantPackageBody,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateTenantPackageBody updateTenantPackageBody;
-}
-
-/// Request parameters for [DefaultApi.updateTenantUser].
-class ApiUpdateTenantUserRequest {
-  const ApiUpdateTenantUserRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateTenantUserBody,
+/// Optional parameters for [DefaultApi.updateTenantUser].
+class ApiUpdateTenantUserOptions {
+  const ApiUpdateTenantUserOptions({
     this.updateComments,
   });
-  final String tenantId;
-  final String id;
-  final UpdateTenantUserBody updateTenantUserBody;
   final String? updateComments;
 }
-
-/// Request parameters for [DefaultApi.updateUserBadge].
-class ApiUpdateUserBadgeRequest {
-  const ApiUpdateUserBadgeRequest({
-    required this.tenantId,
-    required this.id,
-    required this.updateUserBadgeParams,
-  });
-  final String tenantId;
-  final String id;
-  final UpdateUserBadgeParams updateUserBadgeParams;
-}
diff --git a/client/lib/api/moderation_api.dart b/client/lib/api/moderation_api.dart
index dcf98d8..d85c95e 100644
--- a/client/lib/api/moderation_api.dart
+++ b/client/lib/api/moderation_api.dart
@@ -28,12 +28,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteModerationVoteWithHttpInfo(ApiDeleteModerationVoteRequest request,) async {
-    final commentId = request.commentId;
-    final voteId = request.voteId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/vote/{commentId}/{voteId}'
       .replaceAll('{commentId}', commentId)
@@ -81,8 +79,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteModerationVote(ApiDeleteModerationVoteRequest request,) async {
-    final response = await deleteModerationVoteWithHttpInfo(request,);
+  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options, ]) async {
+    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -118,17 +116,17 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiCommentsWithHttpInfo(ApiGetApiCommentsRequest request,) async {
-    final page = request.page;
-    final count = request.count;
-    final textSearch = request.textSearch;
-    final byIPFromComment = request.byIPFromComment;
-    final filters = request.filters;
-    final searchFilters = request.searchFilters;
-    final sorts = request.sorts;
-    final demo = request.demo;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getApiCommentsWithHttpInfo([ ApiGetApiCommentsOptions? options, ]) async {
+    final page = options?.page;
+    final count = options?.count;
+    final textSearch = options?.textSearch;
+    final byIPFromComment = options?.byIPFromComment;
+    final filters = options?.filters;
+    final searchFilters = options?.searchFilters;
+    final sorts = options?.sorts;
+    final demo = options?.demo;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/comments';
 
@@ -205,8 +203,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentsResponse?> getApiComments(ApiGetApiCommentsRequest request,) async {
-    final response = await getApiCommentsWithHttpInfo(request,);
+  Future<ModerationAPIGetCommentsResponse?> getApiComments([ ApiGetApiCommentsOptions? options, ]) async {
+    final response = await getApiCommentsWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -228,10 +226,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiExportStatusWithHttpInfo(ApiGetApiExportStatusRequest request,) async {
-    final batchJobId = request.batchJobId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getApiExportStatusWithHttpInfo([ ApiGetApiExportStatusOptions? options, ]) async {
+    final batchJobId = options?.batchJobId;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/export/status';
 
@@ -273,8 +271,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationExportStatusResponse?> getApiExportStatus(ApiGetApiExportStatusRequest request,) async {
-    final response = await getApiExportStatusWithHttpInfo(request,);
+  Future<ModerationExportStatusResponse?> getApiExportStatus([ ApiGetApiExportStatusOptions? options, ]) async {
+    final response = await getApiExportStatusWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -306,15 +304,15 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiIdsWithHttpInfo(ApiGetApiIdsRequest request,) async {
-    final textSearch = request.textSearch;
-    final byIPFromComment = request.byIPFromComment;
-    final filters = request.filters;
-    final searchFilters = request.searchFilters;
-    final afterId = request.afterId;
-    final demo = request.demo;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getApiIdsWithHttpInfo([ ApiGetApiIdsOptions? options, ]) async {
+    final textSearch = options?.textSearch;
+    final byIPFromComment = options?.byIPFromComment;
+    final filters = options?.filters;
+    final searchFilters = options?.searchFilters;
+    final afterId = options?.afterId;
+    final demo = options?.demo;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/ids';
 
@@ -381,8 +379,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentIdsResponse?> getApiIds(ApiGetApiIdsRequest request,) async {
-    final response = await getApiIdsWithHttpInfo(request,);
+  Future<ModerationAPIGetCommentIdsResponse?> getApiIds([ ApiGetApiIdsOptions? options, ]) async {
+    final response = await getApiIdsWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -404,10 +402,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getBanUsersFromCommentWithHttpInfo(ApiGetBanUsersFromCommentRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, [ ApiGetBanUsersFromCommentOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-users/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -447,8 +444,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(ApiGetBanUsersFromCommentRequest request,) async {
-    final response = await getBanUsersFromCommentWithHttpInfo(request,);
+  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, [ ApiGetBanUsersFromCommentOptions? options, ]) async {
+    final response = await getBanUsersFromCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -470,10 +467,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCommentBanStatusWithHttpInfo(ApiGetCommentBanStatusRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, [ ApiGetCommentBanStatusOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-comment-ban-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -513,8 +509,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetCommentBanStatusResponse?> getCommentBanStatus(ApiGetCommentBanStatusRequest request,) async {
-    final response = await getCommentBanStatusWithHttpInfo(request,);
+  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, [ ApiGetCommentBanStatusOptions? options, ]) async {
+    final response = await getCommentBanStatusWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -536,10 +532,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCommentChildrenWithHttpInfo(ApiGetCommentChildrenRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getCommentChildrenWithHttpInfo(String commentId, [ ApiGetCommentChildrenOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comment-children/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -579,8 +574,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(ApiGetCommentChildrenRequest request,) async {
-    final response = await getCommentChildrenWithHttpInfo(request,);
+  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, [ ApiGetCommentChildrenOptions? options, ]) async {
+    final response = await getCommentChildrenWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -610,14 +605,14 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCountWithHttpInfo(ApiGetCountRequest request,) async {
-    final textSearch = request.textSearch;
-    final byIPFromComment = request.byIPFromComment;
-    final filter = request.filter;
-    final searchFilters = request.searchFilters;
-    final demo = request.demo;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getCountWithHttpInfo([ ApiGetCountOptions? options, ]) async {
+    final textSearch = options?.textSearch;
+    final byIPFromComment = options?.byIPFromComment;
+    final filter = options?.filter;
+    final searchFilters = options?.searchFilters;
+    final demo = options?.demo;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/count';
 
@@ -679,8 +674,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPICountCommentsResponse?> getCount(ApiGetCountRequest request,) async {
-    final response = await getCountWithHttpInfo(request,);
+  Future<ModerationAPICountCommentsResponse?> getCount([ ApiGetCountOptions? options, ]) async {
+    final response = await getCountWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -700,9 +695,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCountsWithHttpInfo(ApiGetCountsRequest request,) async {
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getCountsWithHttpInfo([ ApiGetCountsOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/banned-users/counts';
 
@@ -739,8 +734,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetBannedUsersCountResponse?> getCounts(ApiGetCountsRequest request,) async {
-    final response = await getCountsWithHttpInfo(request,);
+  Future<GetBannedUsersCountResponse?> getCounts([ ApiGetCountsOptions? options, ]) async {
+    final response = await getCountsWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -762,10 +757,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getLogsWithHttpInfo(ApiGetLogsRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getLogsWithHttpInfo(String commentId, [ ApiGetLogsOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/logs/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -805,8 +799,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetLogsResponse?> getLogs(ApiGetLogsRequest request,) async {
-    final response = await getLogsWithHttpInfo(request,);
+  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, [ ApiGetLogsOptions? options, ]) async {
+    final response = await getLogsWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -826,9 +820,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesWithHttpInfo(ApiGetManualBadgesRequest request,) async {
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getManualBadgesWithHttpInfo([ ApiGetManualBadgesOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-manual-badges';
 
@@ -865,8 +859,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetTenantManualBadgesResponse?> getManualBadges(ApiGetManualBadgesRequest request,) async {
-    final response = await getManualBadgesWithHttpInfo(request,);
+  Future<GetTenantManualBadgesResponse?> getManualBadges([ ApiGetManualBadgesOptions? options, ]) async {
+    final response = await getManualBadgesWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -890,11 +884,11 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesForUserWithHttpInfo(ApiGetManualBadgesForUserRequest request,) async {
-    final badgesUserId = request.badgesUserId;
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getManualBadgesForUserWithHttpInfo([ ApiGetManualBadgesForUserOptions? options, ]) async {
+    final badgesUserId = options?.badgesUserId;
+    final commentId = options?.commentId;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-manual-badges-for-user';
 
@@ -941,8 +935,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserManualBadgesResponse?> getManualBadgesForUser(ApiGetManualBadgesForUserRequest request,) async {
-    final response = await getManualBadgesForUserWithHttpInfo(request,);
+  Future<GetUserManualBadgesResponse?> getManualBadgesForUser([ ApiGetManualBadgesForUserOptions? options, ]) async {
+    final response = await getManualBadgesForUserWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -968,12 +962,11 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentWithHttpInfo(ApiGetModerationCommentRequest request,) async {
-    final commentId = request.commentId;
-    final includeEmail = request.includeEmail;
-    final includeIP = request.includeIP;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getModerationCommentWithHttpInfo(String commentId, [ ApiGetModerationCommentOptions? options, ]) async {
+    final includeEmail = options?.includeEmail;
+    final includeIP = options?.includeIP;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1023,8 +1016,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPICommentResponse?> getModerationComment(ApiGetModerationCommentRequest request,) async {
-    final response = await getModerationCommentWithHttpInfo(request,);
+  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, [ ApiGetModerationCommentOptions? options, ]) async {
+    final response = await getModerationCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1046,10 +1039,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentTextWithHttpInfo(ApiGetModerationCommentTextRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, [ ApiGetModerationCommentTextOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1089,8 +1081,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetCommentTextResponse?> getModerationCommentText(ApiGetModerationCommentTextRequest request,) async {
-    final response = await getModerationCommentTextWithHttpInfo(request,);
+  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, [ ApiGetModerationCommentTextOptions? options, ]) async {
+    final response = await getModerationCommentTextWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1118,13 +1110,12 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getPreBanSummaryWithHttpInfo(ApiGetPreBanSummaryRequest request,) async {
-    final commentId = request.commentId;
-    final includeByUserIdAndEmail = request.includeByUserIdAndEmail;
-    final includeByIP = request.includeByIP;
-    final includeByEmailDomain = request.includeByEmailDomain;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, [ ApiGetPreBanSummaryOptions? options, ]) async {
+    final includeByUserIdAndEmail = options?.includeByUserIdAndEmail;
+    final includeByIP = options?.includeByIP;
+    final includeByEmailDomain = options?.includeByEmailDomain;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/pre-ban-summary/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1179,8 +1170,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<PreBanSummary?> getPreBanSummary(ApiGetPreBanSummaryRequest request,) async {
-    final response = await getPreBanSummaryWithHttpInfo(request,);
+  Future<PreBanSummary?> getPreBanSummary(String commentId, [ ApiGetPreBanSummaryOptions? options, ]) async {
+    final response = await getPreBanSummaryWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1206,12 +1197,12 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchCommentsSummaryWithHttpInfo(ApiGetSearchCommentsSummaryRequest request,) async {
-    final value = request.value;
-    final filters = request.filters;
-    final searchFilters = request.searchFilters;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getSearchCommentsSummaryWithHttpInfo([ ApiGetSearchCommentsSummaryOptions? options, ]) async {
+    final value = options?.value;
+    final filters = options?.filters;
+    final searchFilters = options?.searchFilters;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/comments/summary';
 
@@ -1263,8 +1254,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary(ApiGetSearchCommentsSummaryRequest request,) async {
-    final response = await getSearchCommentsSummaryWithHttpInfo(request,);
+  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary([ ApiGetSearchCommentsSummaryOptions? options, ]) async {
+    final response = await getSearchCommentsSummaryWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1286,10 +1277,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchPagesWithHttpInfo(ApiGetSearchPagesRequest request,) async {
-    final value = request.value;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getSearchPagesWithHttpInfo([ ApiGetSearchPagesOptions? options, ]) async {
+    final value = options?.value;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/pages';
 
@@ -1331,8 +1322,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationPageSearchResponse?> getSearchPages(ApiGetSearchPagesRequest request,) async {
-    final response = await getSearchPagesWithHttpInfo(request,);
+  Future<ModerationPageSearchResponse?> getSearchPages([ ApiGetSearchPagesOptions? options, ]) async {
+    final response = await getSearchPagesWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1354,10 +1345,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSitesWithHttpInfo(ApiGetSearchSitesRequest request,) async {
-    final value = request.value;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getSearchSitesWithHttpInfo([ ApiGetSearchSitesOptions? options, ]) async {
+    final value = options?.value;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/sites';
 
@@ -1399,8 +1390,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationSiteSearchResponse?> getSearchSites(ApiGetSearchSitesRequest request,) async {
-    final response = await getSearchSitesWithHttpInfo(request,);
+  Future<ModerationSiteSearchResponse?> getSearchSites([ ApiGetSearchSitesOptions? options, ]) async {
+    final response = await getSearchSitesWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1422,10 +1413,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSuggestWithHttpInfo(ApiGetSearchSuggestRequest request,) async {
-    final textSearch = request.textSearch;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getSearchSuggestWithHttpInfo([ ApiGetSearchSuggestOptions? options, ]) async {
+    final textSearch = options?.textSearch;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/suggest';
 
@@ -1467,8 +1458,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationSuggestResponse?> getSearchSuggest(ApiGetSearchSuggestRequest request,) async {
-    final response = await getSearchSuggestWithHttpInfo(request,);
+  Future<ModerationSuggestResponse?> getSearchSuggest([ ApiGetSearchSuggestOptions? options, ]) async {
+    final response = await getSearchSuggestWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1490,10 +1481,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchUsersWithHttpInfo(ApiGetSearchUsersRequest request,) async {
-    final value = request.value;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getSearchUsersWithHttpInfo([ ApiGetSearchUsersOptions? options, ]) async {
+    final value = options?.value;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/search/users';
 
@@ -1535,8 +1526,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationUserSearchResponse?> getSearchUsers(ApiGetSearchUsersRequest request,) async {
-    final response = await getSearchUsersWithHttpInfo(request,);
+  Future<ModerationUserSearchResponse?> getSearchUsers([ ApiGetSearchUsersOptions? options, ]) async {
+    final response = await getSearchUsersWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1558,10 +1549,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getTrustFactorWithHttpInfo(ApiGetTrustFactorRequest request,) async {
-    final userId = request.userId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getTrustFactorWithHttpInfo([ ApiGetTrustFactorOptions? options, ]) async {
+    final userId = options?.userId;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-trust-factor';
 
@@ -1603,8 +1594,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserTrustFactorResponse?> getTrustFactor(ApiGetTrustFactorRequest request,) async {
-    final response = await getTrustFactorWithHttpInfo(request,);
+  Future<GetUserTrustFactorResponse?> getTrustFactor([ ApiGetTrustFactorOptions? options, ]) async {
+    final response = await getTrustFactorWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1624,9 +1615,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getUserBanPreferenceWithHttpInfo(ApiGetUserBanPreferenceRequest request,) async {
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getUserBanPreferenceWithHttpInfo([ ApiGetUserBanPreferenceOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/user-ban-preference';
 
@@ -1663,8 +1654,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference(ApiGetUserBanPreferenceRequest request,) async {
-    final response = await getUserBanPreferenceWithHttpInfo(request,);
+  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference([ ApiGetUserBanPreferenceOptions? options, ]) async {
+    final response = await getUserBanPreferenceWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1686,10 +1677,10 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getUserInternalProfileWithHttpInfo(ApiGetUserInternalProfileRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getUserInternalProfileWithHttpInfo([ ApiGetUserInternalProfileOptions? options, ]) async {
+    final commentId = options?.commentId;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/get-user-internal-profile';
 
@@ -1731,8 +1722,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserInternalProfileResponse?> getUserInternalProfile(ApiGetUserInternalProfileRequest request,) async {
-    final response = await getUserInternalProfileWithHttpInfo(request,);
+  Future<GetUserInternalProfileResponse?> getUserInternalProfile([ ApiGetUserInternalProfileOptions? options, ]) async {
+    final response = await getUserInternalProfileWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1758,12 +1749,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postAdjustCommentVotesWithHttpInfo(ApiPostAdjustCommentVotesRequest request,) async {
-    final commentId = request.commentId;
-    final adjustCommentVotesParams = request.adjustCommentVotesParams;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/adjust-comment-votes/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -1810,8 +1799,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<AdjustVotesResponse?> postAdjustCommentVotes(ApiPostAdjustCommentVotesRequest request,) async {
-    final response = await postAdjustCommentVotesWithHttpInfo(request,);
+  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options, ]) async {
+    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1841,14 +1830,14 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postApiExportWithHttpInfo(ApiPostApiExportRequest request,) async {
-    final textSearch = request.textSearch;
-    final byIPFromComment = request.byIPFromComment;
-    final filters = request.filters;
-    final searchFilters = request.searchFilters;
-    final sorts = request.sorts;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> postApiExportWithHttpInfo([ ApiPostApiExportOptions? options, ]) async {
+    final textSearch = options?.textSearch;
+    final byIPFromComment = options?.byIPFromComment;
+    final filters = options?.filters;
+    final searchFilters = options?.searchFilters;
+    final sorts = options?.sorts;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/api/export';
 
@@ -1910,8 +1899,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationExportResponse?> postApiExport(ApiPostApiExportRequest request,) async {
-    final response = await postApiExportWithHttpInfo(request,);
+  Future<ModerationExportResponse?> postApiExport([ ApiPostApiExportOptions? options, ]) async {
+    final response = await postApiExportWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1949,18 +1938,17 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBanUserFromCommentWithHttpInfo(ApiPostBanUserFromCommentRequest request,) async {
-    final commentId = request.commentId;
-    final banEmail = request.banEmail;
-    final banEmailDomain = request.banEmailDomain;
-    final banIP = request.banIP;
-    final deleteAllUsersComments = request.deleteAllUsersComments;
-    final bannedUntil = request.bannedUntil;
-    final isShadowBan = request.isShadowBan;
-    final updateId = request.updateId;
-    final banReason = request.banReason;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, [ ApiPostBanUserFromCommentOptions? options, ]) async {
+    final banEmail = options?.banEmail;
+    final banEmailDomain = options?.banEmailDomain;
+    final banIP = options?.banIP;
+    final deleteAllUsersComments = options?.deleteAllUsersComments;
+    final bannedUntil = options?.bannedUntil;
+    final isShadowBan = options?.isShadowBan;
+    final updateId = options?.updateId;
+    final banReason = options?.banReason;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-user/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2040,8 +2028,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<BanUserFromCommentResult?> postBanUserFromComment(ApiPostBanUserFromCommentRequest request,) async {
-    final response = await postBanUserFromCommentWithHttpInfo(request,);
+  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, [ ApiPostBanUserFromCommentOptions? options, ]) async {
+    final response = await postBanUserFromCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2063,10 +2051,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBanUserUndoWithHttpInfo(ApiPostBanUserUndoRequest request,) async {
-    final banUserUndoParams = request.banUserUndoParams;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/ban-user/undo';
 
@@ -2105,8 +2092,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postBanUserUndo(ApiPostBanUserUndoRequest request,) async {
-    final response = await postBanUserUndoWithHttpInfo(request,);
+  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options, ]) async {
+    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2134,13 +2121,12 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBulkPreBanSummaryWithHttpInfo(ApiPostBulkPreBanSummaryRequest request,) async {
-    final bulkPreBanParams = request.bulkPreBanParams;
-    final includeByUserIdAndEmail = request.includeByUserIdAndEmail;
-    final includeByIP = request.includeByIP;
-    final includeByEmailDomain = request.includeByEmailDomain;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options, ]) async {
+    final includeByUserIdAndEmail = options?.includeByUserIdAndEmail;
+    final includeByIP = options?.includeByIP;
+    final includeByEmailDomain = options?.includeByEmailDomain;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/bulk-pre-ban-summary';
 
@@ -2194,8 +2180,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<BulkPreBanSummary?> postBulkPreBanSummary(ApiPostBulkPreBanSummaryRequest request,) async {
-    final response = await postBulkPreBanSummaryWithHttpInfo(request,);
+  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options, ]) async {
+    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2217,10 +2203,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postCommentsByIdsWithHttpInfo(ApiPostCommentsByIdsRequest request,) async {
-    final commentsByIdsParams = request.commentsByIdsParams;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/comments-by-ids';
 
@@ -2259,8 +2244,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(ApiPostCommentsByIdsRequest request,) async {
-    final response = await postCommentsByIdsWithHttpInfo(request,);
+  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options, ]) async {
+    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2284,11 +2269,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postFlagCommentWithHttpInfo(ApiPostFlagCommentRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postFlagCommentWithHttpInfo(String commentId, [ ApiPostFlagCommentOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2333,8 +2317,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postFlagComment(ApiPostFlagCommentRequest request,) async {
-    final response = await postFlagCommentWithHttpInfo(request,);
+  Future<APIEmptyResponse?> postFlagComment(String commentId, [ ApiPostFlagCommentOptions? options, ]) async {
+    final response = await postFlagCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2358,11 +2342,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postRemoveCommentWithHttpInfo(ApiPostRemoveCommentRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postRemoveCommentWithHttpInfo(String commentId, [ ApiPostRemoveCommentOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/remove-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2407,8 +2390,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<PostRemoveCommentResponse?> postRemoveComment(ApiPostRemoveCommentRequest request,) async {
-    final response = await postRemoveCommentWithHttpInfo(request,);
+  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, [ ApiPostRemoveCommentOptions? options, ]) async {
+    final response = await postRemoveCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2432,11 +2415,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postRestoreDeletedCommentWithHttpInfo(ApiPostRestoreDeletedCommentRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, [ ApiPostRestoreDeletedCommentOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/restore-deleted-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2481,8 +2463,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postRestoreDeletedComment(ApiPostRestoreDeletedCommentRequest request,) async {
-    final response = await postRestoreDeletedCommentWithHttpInfo(request,);
+  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, [ ApiPostRestoreDeletedCommentOptions? options, ]) async {
+    final response = await postRestoreDeletedCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2508,12 +2490,11 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentApprovalStatusWithHttpInfo(ApiPostSetCommentApprovalStatusRequest request,) async {
-    final commentId = request.commentId;
-    final approved = request.approved;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options, ]) async {
+    final approved = options?.approved;
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-approval-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2563,8 +2544,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(ApiPostSetCommentApprovalStatusRequest request,) async {
-    final response = await postSetCommentApprovalStatusWithHttpInfo(request,);
+  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options, ]) async {
+    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2590,12 +2571,11 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentReviewStatusWithHttpInfo(ApiPostSetCommentReviewStatusRequest request,) async {
-    final commentId = request.commentId;
-    final reviewed = request.reviewed;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, [ ApiPostSetCommentReviewStatusOptions? options, ]) async {
+    final reviewed = options?.reviewed;
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-review-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2645,8 +2625,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentReviewStatus(ApiPostSetCommentReviewStatusRequest request,) async {
-    final response = await postSetCommentReviewStatusWithHttpInfo(request,);
+  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, [ ApiPostSetCommentReviewStatusOptions? options, ]) async {
+    final response = await postSetCommentReviewStatusWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2674,13 +2654,12 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentSpamStatusWithHttpInfo(ApiPostSetCommentSpamStatusRequest request,) async {
-    final commentId = request.commentId;
-    final spam = request.spam;
-    final permNotSpam = request.permNotSpam;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, [ ApiPostSetCommentSpamStatusOptions? options, ]) async {
+    final spam = options?.spam;
+    final permNotSpam = options?.permNotSpam;
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-spam-status/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2735,8 +2714,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentSpamStatus(ApiPostSetCommentSpamStatusRequest request,) async {
-    final response = await postSetCommentSpamStatusWithHttpInfo(request,);
+  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, [ ApiPostSetCommentSpamStatusOptions? options, ]) async {
+    final response = await postSetCommentSpamStatusWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2762,12 +2741,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentTextWithHttpInfo(ApiPostSetCommentTextRequest request,) async {
-    final commentId = request.commentId;
-    final setCommentTextParams = request.setCommentTextParams;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2814,8 +2791,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<SetCommentTextResponse?> postSetCommentText(ApiPostSetCommentTextRequest request,) async {
-    final response = await postSetCommentTextWithHttpInfo(request,);
+  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options, ]) async {
+    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2839,11 +2816,10 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postUnFlagCommentWithHttpInfo(ApiPostUnFlagCommentRequest request,) async {
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, [ ApiPostUnFlagCommentOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/un-flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2888,8 +2864,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postUnFlagComment(ApiPostUnFlagCommentRequest request,) async {
-    final response = await postUnFlagCommentWithHttpInfo(request,);
+  Future<APIEmptyResponse?> postUnFlagComment(String commentId, [ ApiPostUnFlagCommentOptions? options, ]) async {
+    final response = await postUnFlagCommentWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2915,12 +2891,11 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postVoteWithHttpInfo(ApiPostVoteRequest request,) async {
-    final commentId = request.commentId;
-    final direction = request.direction;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> postVoteWithHttpInfo(String commentId, [ ApiPostVoteOptions? options, ]) async {
+    final direction = options?.direction;
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/vote/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -2970,8 +2945,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> postVote(ApiPostVoteRequest request,) async {
-    final response = await postVoteWithHttpInfo(request,);
+  Future<VoteResponse?> postVote(String commentId, [ ApiPostVoteOptions? options, ]) async {
+    final response = await postVoteWithHttpInfo(commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2999,13 +2974,12 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> putAwardBadgeWithHttpInfo(ApiPutAwardBadgeRequest request,) async {
-    final badgeId = request.badgeId;
-    final userId = request.userId;
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, [ ApiPutAwardBadgeOptions? options, ]) async {
+    final userId = options?.userId;
+    final commentId = options?.commentId;
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/award-badge';
 
@@ -3060,8 +3034,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<AwardUserBadgeResponse?> putAwardBadge(ApiPutAwardBadgeRequest request,) async {
-    final response = await putAwardBadgeWithHttpInfo(request,);
+  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, [ ApiPutAwardBadgeOptions? options, ]) async {
+    final response = await putAwardBadgeWithHttpInfo(badgeId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3083,10 +3057,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> putCloseThreadWithHttpInfo(ApiPutCloseThreadRequest request,) async {
-    final urlId = request.urlId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> putCloseThreadWithHttpInfo(String urlId, [ ApiPutCloseThreadOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/close-thread';
 
@@ -3126,8 +3099,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putCloseThread(ApiPutCloseThreadRequest request,) async {
-    final response = await putCloseThreadWithHttpInfo(request,);
+  Future<APIEmptyResponse?> putCloseThread(String urlId, [ ApiPutCloseThreadOptions? options, ]) async {
+    final response = await putCloseThreadWithHttpInfo(urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3155,13 +3128,12 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> putRemoveBadgeWithHttpInfo(ApiPutRemoveBadgeRequest request,) async {
-    final badgeId = request.badgeId;
-    final userId = request.userId;
-    final commentId = request.commentId;
-    final tenantId = request.tenantId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, [ ApiPutRemoveBadgeOptions? options, ]) async {
+    final userId = options?.userId;
+    final commentId = options?.commentId;
+    final tenantId = options?.tenantId;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/remove-badge';
 
@@ -3216,8 +3188,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<RemoveUserBadgeResponse?> putRemoveBadge(ApiPutRemoveBadgeRequest request,) async {
-    final response = await putRemoveBadgeWithHttpInfo(request,);
+  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, [ ApiPutRemoveBadgeOptions? options, ]) async {
+    final response = await putRemoveBadgeWithHttpInfo(badgeId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3239,10 +3211,9 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> putReopenThreadWithHttpInfo(ApiPutReopenThreadRequest request,) async {
-    final urlId = request.urlId;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> putReopenThreadWithHttpInfo(String urlId, [ ApiPutReopenThreadOptions? options, ]) async {
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/reopen-thread';
 
@@ -3282,8 +3253,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putReopenThread(ApiPutReopenThreadRequest request,) async {
-    final response = await putReopenThreadWithHttpInfo(request,);
+  Future<APIEmptyResponse?> putReopenThread(String urlId, [ ApiPutReopenThreadOptions? options, ]) async {
+    final response = await putReopenThreadWithHttpInfo(urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3307,11 +3278,11 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> setTrustFactorWithHttpInfo(ApiSetTrustFactorRequest request,) async {
-    final userId = request.userId;
-    final trustFactor = request.trustFactor;
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> setTrustFactorWithHttpInfo([ ApiSetTrustFactorOptions? options, ]) async {
+    final userId = options?.userId;
+    final trustFactor = options?.trustFactor;
+    final tenantId = options?.tenantId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/auth/my-account/moderate-comments/set-trust-factor';
 
@@ -3358,8 +3329,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<SetUserTrustFactorResponse?> setTrustFactor(ApiSetTrustFactorRequest request,) async {
-    final response = await setTrustFactorWithHttpInfo(request,);
+  Future<SetUserTrustFactorResponse?> setTrustFactor([ ApiSetTrustFactorOptions? options, ]) async {
+    final response = await setTrustFactorWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3374,25 +3345,21 @@ class ModerationApi {
   }
 }
 
-/// Request parameters for [ModerationApi.deleteModerationVote].
-class ApiDeleteModerationVoteRequest {
-  const ApiDeleteModerationVoteRequest({
-    required this.commentId,
-    required this.voteId,
+/// Optional parameters for [ModerationApi.deleteModerationVote].
+class ApiDeleteModerationVoteOptions {
+  const ApiDeleteModerationVoteOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
-  final String voteId;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getApiComments].
-class ApiGetApiCommentsRequest {
-  const ApiGetApiCommentsRequest({
+/// Optional parameters for [ModerationApi.getApiComments].
+class ApiGetApiCommentsOptions {
+  const ApiGetApiCommentsOptions({
     this.page,
     this.count,
     this.textSearch,
@@ -3416,9 +3383,9 @@ class ApiGetApiCommentsRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getApiExportStatus].
-class ApiGetApiExportStatusRequest {
-  const ApiGetApiExportStatusRequest({
+/// Optional parameters for [ModerationApi.getApiExportStatus].
+class ApiGetApiExportStatusOptions {
+  const ApiGetApiExportStatusOptions({
     this.batchJobId,
     this.tenantId,
     this.sso,
@@ -3428,9 +3395,9 @@ class ApiGetApiExportStatusRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getApiIds].
-class ApiGetApiIdsRequest {
-  const ApiGetApiIdsRequest({
+/// Optional parameters for [ModerationApi.getApiIds].
+class ApiGetApiIdsOptions {
+  const ApiGetApiIdsOptions({
     this.textSearch,
     this.byIPFromComment,
     this.filters,
@@ -3450,45 +3417,39 @@ class ApiGetApiIdsRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getBanUsersFromComment].
-class ApiGetBanUsersFromCommentRequest {
-  const ApiGetBanUsersFromCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getBanUsersFromComment].
+class ApiGetBanUsersFromCommentOptions {
+  const ApiGetBanUsersFromCommentOptions({
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getCommentBanStatus].
-class ApiGetCommentBanStatusRequest {
-  const ApiGetCommentBanStatusRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getCommentBanStatus].
+class ApiGetCommentBanStatusOptions {
+  const ApiGetCommentBanStatusOptions({
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getCommentChildren].
-class ApiGetCommentChildrenRequest {
-  const ApiGetCommentChildrenRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getCommentChildren].
+class ApiGetCommentChildrenOptions {
+  const ApiGetCommentChildrenOptions({
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getCount].
-class ApiGetCountRequest {
-  const ApiGetCountRequest({
+/// Optional parameters for [ModerationApi.getCount].
+class ApiGetCountOptions {
+  const ApiGetCountOptions({
     this.textSearch,
     this.byIPFromComment,
     this.filter,
@@ -3506,9 +3467,9 @@ class ApiGetCountRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getCounts].
-class ApiGetCountsRequest {
-  const ApiGetCountsRequest({
+/// Optional parameters for [ModerationApi.getCounts].
+class ApiGetCountsOptions {
+  const ApiGetCountsOptions({
     this.tenantId,
     this.sso,
   });
@@ -3516,21 +3477,19 @@ class ApiGetCountsRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getLogs].
-class ApiGetLogsRequest {
-  const ApiGetLogsRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getLogs].
+class ApiGetLogsOptions {
+  const ApiGetLogsOptions({
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getManualBadges].
-class ApiGetManualBadgesRequest {
-  const ApiGetManualBadgesRequest({
+/// Optional parameters for [ModerationApi.getManualBadges].
+class ApiGetManualBadgesOptions {
+  const ApiGetManualBadgesOptions({
     this.tenantId,
     this.sso,
   });
@@ -3538,9 +3497,9 @@ class ApiGetManualBadgesRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getManualBadgesForUser].
-class ApiGetManualBadgesForUserRequest {
-  const ApiGetManualBadgesForUserRequest({
+/// Optional parameters for [ModerationApi.getManualBadgesForUser].
+class ApiGetManualBadgesForUserOptions {
+  const ApiGetManualBadgesForUserOptions({
     this.badgesUserId,
     this.commentId,
     this.tenantId,
@@ -3552,45 +3511,39 @@ class ApiGetManualBadgesForUserRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getModerationComment].
-class ApiGetModerationCommentRequest {
-  const ApiGetModerationCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getModerationComment].
+class ApiGetModerationCommentOptions {
+  const ApiGetModerationCommentOptions({
     this.includeEmail,
     this.includeIP,
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final bool? includeEmail;
   final bool? includeIP;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getModerationCommentText].
-class ApiGetModerationCommentTextRequest {
-  const ApiGetModerationCommentTextRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getModerationCommentText].
+class ApiGetModerationCommentTextOptions {
+  const ApiGetModerationCommentTextOptions({
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getPreBanSummary].
-class ApiGetPreBanSummaryRequest {
-  const ApiGetPreBanSummaryRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.getPreBanSummary].
+class ApiGetPreBanSummaryOptions {
+  const ApiGetPreBanSummaryOptions({
     this.includeByUserIdAndEmail,
     this.includeByIP,
     this.includeByEmailDomain,
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final bool? includeByUserIdAndEmail;
   final bool? includeByIP;
   final bool? includeByEmailDomain;
@@ -3598,9 +3551,9 @@ class ApiGetPreBanSummaryRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getSearchCommentsSummary].
-class ApiGetSearchCommentsSummaryRequest {
-  const ApiGetSearchCommentsSummaryRequest({
+/// Optional parameters for [ModerationApi.getSearchCommentsSummary].
+class ApiGetSearchCommentsSummaryOptions {
+  const ApiGetSearchCommentsSummaryOptions({
     this.value,
     this.filters,
     this.searchFilters,
@@ -3614,9 +3567,9 @@ class ApiGetSearchCommentsSummaryRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getSearchPages].
-class ApiGetSearchPagesRequest {
-  const ApiGetSearchPagesRequest({
+/// Optional parameters for [ModerationApi.getSearchPages].
+class ApiGetSearchPagesOptions {
+  const ApiGetSearchPagesOptions({
     this.value,
     this.tenantId,
     this.sso,
@@ -3626,9 +3579,9 @@ class ApiGetSearchPagesRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getSearchSites].
-class ApiGetSearchSitesRequest {
-  const ApiGetSearchSitesRequest({
+/// Optional parameters for [ModerationApi.getSearchSites].
+class ApiGetSearchSitesOptions {
+  const ApiGetSearchSitesOptions({
     this.value,
     this.tenantId,
     this.sso,
@@ -3638,9 +3591,9 @@ class ApiGetSearchSitesRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getSearchSuggest].
-class ApiGetSearchSuggestRequest {
-  const ApiGetSearchSuggestRequest({
+/// Optional parameters for [ModerationApi.getSearchSuggest].
+class ApiGetSearchSuggestOptions {
+  const ApiGetSearchSuggestOptions({
     this.textSearch,
     this.tenantId,
     this.sso,
@@ -3650,9 +3603,9 @@ class ApiGetSearchSuggestRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getSearchUsers].
-class ApiGetSearchUsersRequest {
-  const ApiGetSearchUsersRequest({
+/// Optional parameters for [ModerationApi.getSearchUsers].
+class ApiGetSearchUsersOptions {
+  const ApiGetSearchUsersOptions({
     this.value,
     this.tenantId,
     this.sso,
@@ -3662,9 +3615,9 @@ class ApiGetSearchUsersRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getTrustFactor].
-class ApiGetTrustFactorRequest {
-  const ApiGetTrustFactorRequest({
+/// Optional parameters for [ModerationApi.getTrustFactor].
+class ApiGetTrustFactorOptions {
+  const ApiGetTrustFactorOptions({
     this.userId,
     this.tenantId,
     this.sso,
@@ -3674,9 +3627,9 @@ class ApiGetTrustFactorRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getUserBanPreference].
-class ApiGetUserBanPreferenceRequest {
-  const ApiGetUserBanPreferenceRequest({
+/// Optional parameters for [ModerationApi.getUserBanPreference].
+class ApiGetUserBanPreferenceOptions {
+  const ApiGetUserBanPreferenceOptions({
     this.tenantId,
     this.sso,
   });
@@ -3684,9 +3637,9 @@ class ApiGetUserBanPreferenceRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.getUserInternalProfile].
-class ApiGetUserInternalProfileRequest {
-  const ApiGetUserInternalProfileRequest({
+/// Optional parameters for [ModerationApi.getUserInternalProfile].
+class ApiGetUserInternalProfileOptions {
+  const ApiGetUserInternalProfileOptions({
     this.commentId,
     this.tenantId,
     this.sso,
@@ -3696,25 +3649,21 @@ class ApiGetUserInternalProfileRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postAdjustCommentVotes].
-class ApiPostAdjustCommentVotesRequest {
-  const ApiPostAdjustCommentVotesRequest({
-    required this.commentId,
-    required this.adjustCommentVotesParams,
+/// Optional parameters for [ModerationApi.postAdjustCommentVotes].
+class ApiPostAdjustCommentVotesOptions {
+  const ApiPostAdjustCommentVotesOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
-  final AdjustCommentVotesParams adjustCommentVotesParams;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postApiExport].
-class ApiPostApiExportRequest {
-  const ApiPostApiExportRequest({
+/// Optional parameters for [ModerationApi.postApiExport].
+class ApiPostApiExportOptions {
+  const ApiPostApiExportOptions({
     this.textSearch,
     this.byIPFromComment,
     this.filters,
@@ -3732,10 +3681,9 @@ class ApiPostApiExportRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postBanUserFromComment].
-class ApiPostBanUserFromCommentRequest {
-  const ApiPostBanUserFromCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postBanUserFromComment].
+class ApiPostBanUserFromCommentOptions {
+  const ApiPostBanUserFromCommentOptions({
     this.banEmail,
     this.banEmailDomain,
     this.banIP,
@@ -3747,7 +3695,6 @@ class ApiPostBanUserFromCommentRequest {
     this.tenantId,
     this.sso,
   });
-  final String commentId;
   final bool? banEmail;
   final bool? banEmailDomain;
   final bool? banIP;
@@ -3760,29 +3707,25 @@ class ApiPostBanUserFromCommentRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postBanUserUndo].
-class ApiPostBanUserUndoRequest {
-  const ApiPostBanUserUndoRequest({
-    required this.banUserUndoParams,
+/// Optional parameters for [ModerationApi.postBanUserUndo].
+class ApiPostBanUserUndoOptions {
+  const ApiPostBanUserUndoOptions({
     this.tenantId,
     this.sso,
   });
-  final BanUserUndoParams banUserUndoParams;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postBulkPreBanSummary].
-class ApiPostBulkPreBanSummaryRequest {
-  const ApiPostBulkPreBanSummaryRequest({
-    required this.bulkPreBanParams,
+/// Optional parameters for [ModerationApi.postBulkPreBanSummary].
+class ApiPostBulkPreBanSummaryOptions {
+  const ApiPostBulkPreBanSummaryOptions({
     this.includeByUserIdAndEmail,
     this.includeByIP,
     this.includeByEmailDomain,
     this.tenantId,
     this.sso,
   });
-  final BulkPreBanParams bulkPreBanParams;
   final bool? includeByUserIdAndEmail;
   final bool? includeByIP;
   final bool? includeByEmailDomain;
@@ -3790,103 +3733,89 @@ class ApiPostBulkPreBanSummaryRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postCommentsByIds].
-class ApiPostCommentsByIdsRequest {
-  const ApiPostCommentsByIdsRequest({
-    required this.commentsByIdsParams,
+/// Optional parameters for [ModerationApi.postCommentsByIds].
+class ApiPostCommentsByIdsOptions {
+  const ApiPostCommentsByIdsOptions({
     this.tenantId,
     this.sso,
   });
-  final CommentsByIdsParams commentsByIdsParams;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postFlagComment].
-class ApiPostFlagCommentRequest {
-  const ApiPostFlagCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postFlagComment].
+class ApiPostFlagCommentOptions {
+  const ApiPostFlagCommentOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postRemoveComment].
-class ApiPostRemoveCommentRequest {
-  const ApiPostRemoveCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postRemoveComment].
+class ApiPostRemoveCommentOptions {
+  const ApiPostRemoveCommentOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postRestoreDeletedComment].
-class ApiPostRestoreDeletedCommentRequest {
-  const ApiPostRestoreDeletedCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postRestoreDeletedComment].
+class ApiPostRestoreDeletedCommentOptions {
+  const ApiPostRestoreDeletedCommentOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postSetCommentApprovalStatus].
-class ApiPostSetCommentApprovalStatusRequest {
-  const ApiPostSetCommentApprovalStatusRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postSetCommentApprovalStatus].
+class ApiPostSetCommentApprovalStatusOptions {
+  const ApiPostSetCommentApprovalStatusOptions({
     this.approved,
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final bool? approved;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postSetCommentReviewStatus].
-class ApiPostSetCommentReviewStatusRequest {
-  const ApiPostSetCommentReviewStatusRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postSetCommentReviewStatus].
+class ApiPostSetCommentReviewStatusOptions {
+  const ApiPostSetCommentReviewStatusOptions({
     this.reviewed,
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final bool? reviewed;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postSetCommentSpamStatus].
-class ApiPostSetCommentSpamStatusRequest {
-  const ApiPostSetCommentSpamStatusRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postSetCommentSpamStatus].
+class ApiPostSetCommentSpamStatusOptions {
+  const ApiPostSetCommentSpamStatusOptions({
     this.spam,
     this.permNotSpam,
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final bool? spam;
   final bool? permNotSpam;
   final String? tenantId;
@@ -3894,63 +3823,53 @@ class ApiPostSetCommentSpamStatusRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postSetCommentText].
-class ApiPostSetCommentTextRequest {
-  const ApiPostSetCommentTextRequest({
-    required this.commentId,
-    required this.setCommentTextParams,
+/// Optional parameters for [ModerationApi.postSetCommentText].
+class ApiPostSetCommentTextOptions {
+  const ApiPostSetCommentTextOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
-  final SetCommentTextParams setCommentTextParams;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postUnFlagComment].
-class ApiPostUnFlagCommentRequest {
-  const ApiPostUnFlagCommentRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postUnFlagComment].
+class ApiPostUnFlagCommentOptions {
+  const ApiPostUnFlagCommentOptions({
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.postVote].
-class ApiPostVoteRequest {
-  const ApiPostVoteRequest({
-    required this.commentId,
+/// Optional parameters for [ModerationApi.postVote].
+class ApiPostVoteOptions {
+  const ApiPostVoteOptions({
     this.direction,
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String commentId;
   final String? direction;
   final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.putAwardBadge].
-class ApiPutAwardBadgeRequest {
-  const ApiPutAwardBadgeRequest({
-    required this.badgeId,
+/// Optional parameters for [ModerationApi.putAwardBadge].
+class ApiPutAwardBadgeOptions {
+  const ApiPutAwardBadgeOptions({
     this.userId,
     this.commentId,
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String badgeId;
   final String? userId;
   final String? commentId;
   final String? tenantId;
@@ -3958,29 +3877,25 @@ class ApiPutAwardBadgeRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.putCloseThread].
-class ApiPutCloseThreadRequest {
-  const ApiPutCloseThreadRequest({
-    required this.urlId,
+/// Optional parameters for [ModerationApi.putCloseThread].
+class ApiPutCloseThreadOptions {
+  const ApiPutCloseThreadOptions({
     this.tenantId,
     this.sso,
   });
-  final String urlId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.putRemoveBadge].
-class ApiPutRemoveBadgeRequest {
-  const ApiPutRemoveBadgeRequest({
-    required this.badgeId,
+/// Optional parameters for [ModerationApi.putRemoveBadge].
+class ApiPutRemoveBadgeOptions {
+  const ApiPutRemoveBadgeOptions({
     this.userId,
     this.commentId,
     this.tenantId,
     this.broadcastId,
     this.sso,
   });
-  final String badgeId;
   final String? userId;
   final String? commentId;
   final String? tenantId;
@@ -3988,21 +3903,19 @@ class ApiPutRemoveBadgeRequest {
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.putReopenThread].
-class ApiPutReopenThreadRequest {
-  const ApiPutReopenThreadRequest({
-    required this.urlId,
+/// Optional parameters for [ModerationApi.putReopenThread].
+class ApiPutReopenThreadOptions {
+  const ApiPutReopenThreadOptions({
     this.tenantId,
     this.sso,
   });
-  final String urlId;
   final String? tenantId;
   final String? sso;
 }
 
-/// Request parameters for [ModerationApi.setTrustFactor].
-class ApiSetTrustFactorRequest {
-  const ApiSetTrustFactorRequest({
+/// Optional parameters for [ModerationApi.setTrustFactor].
+class ApiSetTrustFactorOptions {
+  const ApiSetTrustFactorOptions({
     this.userId,
     this.trustFactor,
     this.tenantId,
diff --git a/client/lib/api/public_api.dart b/client/lib/api/public_api.dart
index 1b088da..c3ae689 100644
--- a/client/lib/api/public_api.dart
+++ b/client/lib/api/public_api.dart
@@ -26,11 +26,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> blockFromCommentPublicWithHttpInfo(ApiBlockFromCommentPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final publicBlockFromCommentParams = request.publicBlockFromCommentParams;
-    final sso = request.sso;
+  Future<Response> blockFromCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiBlockFromCommentPublicOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -70,8 +67,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<BlockSuccess?> blockFromCommentPublic(ApiBlockFromCommentPublicRequest request,) async {
-    final response = await blockFromCommentPublicWithHttpInfo(request,);
+  Future<BlockSuccess?> blockFromCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiBlockFromCommentPublicOptions? options, ]) async {
+    final response = await blockFromCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -94,10 +91,8 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<Response> checkedCommentsForBlockedWithHttpInfo(ApiCheckedCommentsForBlockedRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentIds = request.commentIds;
-    final sso = request.sso;
+  Future<Response> checkedCommentsForBlockedWithHttpInfo(String tenantId, String commentIds, [ ApiCheckedCommentsForBlockedOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/check-blocked-comments';
 
@@ -136,8 +131,8 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(ApiCheckedCommentsForBlockedRequest request,) async {
-    final response = await checkedCommentsForBlockedWithHttpInfo(request,);
+  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(String tenantId, String commentIds, [ ApiCheckedCommentsForBlockedOptions? options, ]) async {
+    final response = await checkedCommentsForBlockedWithHttpInfo(tenantId, commentIds, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -165,13 +160,9 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> createCommentPublicWithHttpInfo(ApiCreateCommentPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final broadcastId = request.broadcastId;
-    final commentData = request.commentData;
-    final sessionId = request.sessionId;
-    final sso = request.sso;
+  Future<Response> createCommentPublicWithHttpInfo(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options, ]) async {
+    final sessionId = options?.sessionId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -219,8 +210,8 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<SaveCommentsResponseWithPresence?> createCommentPublic(ApiCreateCommentPublicRequest request,) async {
-    final response = await createCommentPublicWithHttpInfo(request,);
+  Future<SaveCommentsResponseWithPresence?> createCommentPublic(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options, ]) async {
+    final response = await createCommentPublicWithHttpInfo(tenantId, urlId, broadcastId, commentData, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -244,11 +235,9 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> createFeedPostPublicWithHttpInfo(ApiCreateFeedPostPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final createFeedPostParams = request.createFeedPostParams;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> createFeedPostPublicWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options, ]) async {
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -290,8 +279,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> createFeedPostPublic(ApiCreateFeedPostPublicRequest request,) async {
-    final response = await createFeedPostPublicWithHttpInfo(request,);
+  Future<CreateFeedPostResponse?> createFeedPostPublic(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options, ]) async {
+    final response = await createFeedPostPublicWithHttpInfo(tenantId, createFeedPostParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -313,10 +302,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<Response> createV1PageReactWithHttpInfo(ApiCreateV1PageReactRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final title = request.title;
+  Future<Response> createV1PageReactWithHttpInfo(String tenantId, String urlId, [ ApiCreateV1PageReactOptions? options, ]) async {
+    final title = options?.title;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -354,8 +341,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV1PageReact(ApiCreateV1PageReactRequest request,) async {
-    final response = await createV1PageReactWithHttpInfo(request,);
+  Future<CreateV1PageReact?> createV1PageReact(String tenantId, String urlId, [ ApiCreateV1PageReactOptions? options, ]) async {
+    final response = await createV1PageReactWithHttpInfo(tenantId, urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -379,11 +366,8 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<Response> createV2PageReactWithHttpInfo(ApiCreateV2PageReactRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final id = request.id;
-    final title = request.title;
+  Future<Response> createV2PageReactWithHttpInfo(String tenantId, String urlId, String id, [ ApiCreateV2PageReactOptions? options, ]) async {
+    final title = options?.title;
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -424,8 +408,8 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV2PageReact(ApiCreateV2PageReactRequest request,) async {
-    final response = await createV2PageReactWithHttpInfo(request,);
+  Future<CreateV1PageReact?> createV2PageReact(String tenantId, String urlId, String id, [ ApiCreateV2PageReactOptions? options, ]) async {
+    final response = await createV2PageReactWithHttpInfo(tenantId, urlId, id, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -451,12 +435,9 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentPublicWithHttpInfo(ApiDeleteCommentPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final broadcastId = request.broadcastId;
-    final editKey = request.editKey;
-    final sso = request.sso;
+  Future<Response> deleteCommentPublicWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options, ]) async {
+    final editKey = options?.editKey;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}'
       .replaceAll('{tenantId}', tenantId)
@@ -502,8 +483,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(ApiDeleteCommentPublicRequest request,) async {
-    final response = await deleteCommentPublicWithHttpInfo(request,);
+  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options, ]) async {
+    final response = await deleteCommentPublicWithHttpInfo(tenantId, commentId, broadcastId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -533,14 +514,9 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentVoteWithHttpInfo(ApiDeleteCommentVoteRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final voteId = request.voteId;
-    final urlId = request.urlId;
-    final broadcastId = request.broadcastId;
-    final editKey = request.editKey;
-    final sso = request.sso;
+  Future<Response> deleteCommentVoteWithHttpInfo(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options, ]) async {
+    final editKey = options?.editKey;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/vote/{voteId}'
       .replaceAll('{tenantId}', tenantId)
@@ -592,8 +568,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteCommentVote(ApiDeleteCommentVoteRequest request,) async {
-    final response = await deleteCommentVoteWithHttpInfo(request,);
+  Future<VoteDeleteResponse?> deleteCommentVote(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options, ]) async {
+    final response = await deleteCommentVoteWithHttpInfo(tenantId, commentId, voteId, urlId, broadcastId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -617,11 +593,9 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteFeedPostPublicWithHttpInfo(ApiDeleteFeedPostPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final postId = request.postId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> deleteFeedPostPublicWithHttpInfo(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options, ]) async {
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/{postId}'
       .replaceAll('{tenantId}', tenantId)
@@ -664,8 +638,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(ApiDeleteFeedPostPublicRequest request,) async {
-    final response = await deleteFeedPostPublicWithHttpInfo(request,);
+  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options, ]) async {
+    final response = await deleteFeedPostPublicWithHttpInfo(tenantId, postId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -685,9 +659,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> deleteV1PageReactWithHttpInfo(ApiDeleteV1PageReactRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
+  Future<Response> deleteV1PageReactWithHttpInfo(String tenantId, String urlId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -720,8 +692,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<CreateV1PageReact?> deleteV1PageReact(ApiDeleteV1PageReactRequest request,) async {
-    final response = await deleteV1PageReactWithHttpInfo(request,);
+  Future<CreateV1PageReact?> deleteV1PageReact(String tenantId, String urlId, ) async {
+    final response = await deleteV1PageReactWithHttpInfo(tenantId, urlId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -743,10 +715,7 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteV2PageReactWithHttpInfo(ApiDeleteV2PageReactRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final id = request.id;
+  Future<Response> deleteV2PageReactWithHttpInfo(String tenantId, String urlId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -782,8 +751,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<CreateV1PageReact?> deleteV2PageReact(ApiDeleteV2PageReactRequest request,) async {
-    final response = await deleteV2PageReactWithHttpInfo(request,);
+  Future<CreateV1PageReact?> deleteV2PageReact(String tenantId, String urlId, String id, ) async {
+    final response = await deleteV2PageReactWithHttpInfo(tenantId, urlId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -807,11 +776,8 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<Response> flagCommentPublicWithHttpInfo(ApiFlagCommentPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final isFlagged = request.isFlagged;
-    final sso = request.sso;
+  Future<Response> flagCommentPublicWithHttpInfo(String tenantId, String commentId, bool isFlagged, [ ApiFlagCommentPublicOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -852,8 +818,8 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> flagCommentPublic(ApiFlagCommentPublicRequest request,) async {
-    final response = await flagCommentPublicWithHttpInfo(request,);
+  Future<APIEmptyResponse?> flagCommentPublic(String tenantId, String commentId, bool isFlagged, [ ApiFlagCommentPublicOptions? options, ]) async {
+    final response = await flagCommentPublicWithHttpInfo(tenantId, commentId, isFlagged, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -877,11 +843,9 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> getCommentTextWithHttpInfo(ApiGetCommentTextRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final editKey = request.editKey;
-    final sso = request.sso;
+  Future<Response> getCommentTextWithHttpInfo(String tenantId, String commentId, [ ApiGetCommentTextOptions? options, ]) async {
+    final editKey = options?.editKey;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/text'
       .replaceAll('{tenantId}', tenantId)
@@ -924,8 +888,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIGetCommentTextResponse?> getCommentText(ApiGetCommentTextRequest request,) async {
-    final response = await getCommentTextWithHttpInfo(request,);
+  Future<PublicAPIGetCommentTextResponse?> getCommentText(String tenantId, String commentId, [ ApiGetCommentTextOptions? options, ]) async {
+    final response = await getCommentTextWithHttpInfo(tenantId, commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -949,11 +913,8 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<Response> getCommentVoteUserNamesWithHttpInfo(ApiGetCommentVoteUserNamesRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final dir = request.dir;
-    final sso = request.sso;
+  Future<Response> getCommentVoteUserNamesWithHttpInfo(String tenantId, String commentId, int dir, [ ApiGetCommentVoteUserNamesOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/votes'
       .replaceAll('{tenantId}', tenantId)
@@ -994,8 +955,8 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(ApiGetCommentVoteUserNamesRequest request,) async {
-    final response = await getCommentVoteUserNamesWithHttpInfo(request,);
+  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(String tenantId, String commentId, int dir, [ ApiGetCommentVoteUserNamesOptions? options, ]) async {
+    final response = await getCommentVoteUserNamesWithHttpInfo(tenantId, commentId, dir, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1025,14 +986,14 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<Response> getCommentsForUserWithHttpInfo(ApiGetCommentsForUserRequest request,) async {
-    final userId = request.userId;
-    final direction = request.direction;
-    final repliesToUserId = request.repliesToUserId;
-    final page = request.page;
-    final includei10n = request.includei10n;
-    final locale = request.locale;
-    final isCrawler = request.isCrawler;
+  Future<Response> getCommentsForUserWithHttpInfo([ ApiGetCommentsForUserOptions? options, ]) async {
+    final userId = options?.userId;
+    final direction = options?.direction;
+    final repliesToUserId = options?.repliesToUserId;
+    final page = options?.page;
+    final includei10n = options?.includei10n;
+    final locale = options?.locale;
+    final isCrawler = options?.isCrawler;
     // ignore: prefer_const_declarations
     final path = r'/comments-for-user';
 
@@ -1094,8 +1055,8 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<GetCommentsForUserResponse?> getCommentsForUser(ApiGetCommentsForUserRequest request,) async {
-    final response = await getCommentsForUserWithHttpInfo(request,);
+  Future<GetCommentsForUserResponse?> getCommentsForUser([ ApiGetCommentsForUserOptions? options, ]) async {
+    final response = await getCommentsForUserWithHttpInfo(options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1170,35 +1131,33 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<Response> getCommentsPublicWithHttpInfo(ApiGetCommentsPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final page = request.page;
-    final direction = request.direction;
-    final sso = request.sso;
-    final skip = request.skip;
-    final skipChildren = request.skipChildren;
-    final limit = request.limit;
-    final limitChildren = request.limitChildren;
-    final countChildren = request.countChildren;
-    final fetchPageForCommentId = request.fetchPageForCommentId;
-    final includeConfig = request.includeConfig;
-    final countAll = request.countAll;
-    final includei10n = request.includei10n;
-    final locale = request.locale;
-    final modules = request.modules;
-    final isCrawler = request.isCrawler;
-    final includeNotificationCount = request.includeNotificationCount;
-    final asTree = request.asTree;
-    final maxTreeDepth = request.maxTreeDepth;
-    final useFullTranslationIds = request.useFullTranslationIds;
-    final parentId = request.parentId;
-    final searchText = request.searchText;
-    final hashTags = request.hashTags;
-    final userId = request.userId;
-    final customConfigStr = request.customConfigStr;
-    final afterCommentId = request.afterCommentId;
-    final beforeCommentId = request.beforeCommentId;
+  Future<Response> getCommentsPublicWithHttpInfo(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options, ]) async {
+    final page = options?.page;
+    final direction = options?.direction;
+    final sso = options?.sso;
+    final skip = options?.skip;
+    final skipChildren = options?.skipChildren;
+    final limit = options?.limit;
+    final limitChildren = options?.limitChildren;
+    final countChildren = options?.countChildren;
+    final fetchPageForCommentId = options?.fetchPageForCommentId;
+    final includeConfig = options?.includeConfig;
+    final countAll = options?.countAll;
+    final includei10n = options?.includei10n;
+    final locale = options?.locale;
+    final modules = options?.modules;
+    final isCrawler = options?.isCrawler;
+    final includeNotificationCount = options?.includeNotificationCount;
+    final asTree = options?.asTree;
+    final maxTreeDepth = options?.maxTreeDepth;
+    final useFullTranslationIds = options?.useFullTranslationIds;
+    final parentId = options?.parentId;
+    final searchText = options?.searchText;
+    final hashTags = options?.hashTags;
+    final userId = options?.userId;
+    final customConfigStr = options?.customConfigStr;
+    final afterCommentId = options?.afterCommentId;
+    final beforeCommentId = options?.beforeCommentId;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1363,8 +1322,8 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(ApiGetCommentsPublicRequest request,) async {
-    final response = await getCommentsPublicWithHttpInfo(request,);
+  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options, ]) async {
+    final response = await getCommentsPublicWithHttpInfo(tenantId, urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1393,12 +1352,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getEventLogWithHttpInfo(ApiGetEventLogRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final userIdWS = request.userIdWS;
-    final startTime = request.startTime;
-    final endTime = request.endTime;
+  Future<Response> getEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetEventLogOptions? options, ]) async {
+    final endTime = options?.endTime;
     // ignore: prefer_const_declarations
     final path = r'/event-log/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1444,8 +1399,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getEventLog(ApiGetEventLogRequest request,) async {
-    final response = await getEventLogWithHttpInfo(request,);
+  Future<GetEventLogResponse?> getEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetEventLogOptions? options, ]) async {
+    final response = await getEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1478,14 +1433,13 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<Response> getFeedPostsPublicWithHttpInfo(ApiGetFeedPostsPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final afterId = request.afterId;
-    final limit = request.limit;
-    final tags = request.tags;
-    final sso = request.sso;
-    final isCrawler = request.isCrawler;
-    final includeUserInfo = request.includeUserInfo;
+  Future<Response> getFeedPostsPublicWithHttpInfo(String tenantId, [ ApiGetFeedPostsPublicOptions? options, ]) async {
+    final afterId = options?.afterId;
+    final limit = options?.limit;
+    final tags = options?.tags;
+    final sso = options?.sso;
+    final isCrawler = options?.isCrawler;
+    final includeUserInfo = options?.includeUserInfo;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1547,8 +1501,8 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<PublicFeedPostsResponse?> getFeedPostsPublic(ApiGetFeedPostsPublicRequest request,) async {
-    final response = await getFeedPostsPublicWithHttpInfo(request,);
+  Future<PublicFeedPostsResponse?> getFeedPostsPublic(String tenantId, [ ApiGetFeedPostsPublicOptions? options, ]) async {
+    final response = await getFeedPostsPublicWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1570,10 +1524,8 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<Response> getFeedPostsStatsWithHttpInfo(ApiGetFeedPostsStatsRequest request,) async {
-    final tenantId = request.tenantId;
-    final postIds = request.postIds;
-    final sso = request.sso;
+  Future<Response> getFeedPostsStatsWithHttpInfo(String tenantId, List<String> postIds, [ ApiGetFeedPostsStatsOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/stats'
       .replaceAll('{tenantId}', tenantId);
@@ -1611,8 +1563,8 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<FeedPostsStatsResponse?> getFeedPostsStats(ApiGetFeedPostsStatsRequest request,) async {
-    final response = await getFeedPostsStatsWithHttpInfo(request,);
+  Future<FeedPostsStatsResponse?> getFeedPostsStats(String tenantId, List<String> postIds, [ ApiGetFeedPostsStatsOptions? options, ]) async {
+    final response = await getFeedPostsStatsWithHttpInfo(tenantId, postIds, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1632,9 +1584,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] largeInternalURLSanitized (required):
-  Future<Response> getGifLargeWithHttpInfo(ApiGetGifLargeRequest request,) async {
-    final tenantId = request.tenantId;
-    final largeInternalURLSanitized = request.largeInternalURLSanitized;
+  Future<Response> getGifLargeWithHttpInfo(String tenantId, String largeInternalURLSanitized, ) async {
     // ignore: prefer_const_declarations
     final path = r'/gifs/get-large/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1667,8 +1617,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] largeInternalURLSanitized (required):
-  Future<GifGetLargeResponse?> getGifLarge(ApiGetGifLargeRequest request,) async {
-    final response = await getGifLargeWithHttpInfo(request,);
+  Future<GifGetLargeResponse?> getGifLarge(String tenantId, String largeInternalURLSanitized, ) async {
+    final response = await getGifLargeWithHttpInfo(tenantId, largeInternalURLSanitized, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1694,12 +1644,10 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsSearchWithHttpInfo(ApiGetGifsSearchRequest request,) async {
-    final tenantId = request.tenantId;
-    final search = request.search;
-    final locale = request.locale;
-    final rating = request.rating;
-    final page = request.page;
+  Future<Response> getGifsSearchWithHttpInfo(String tenantId, String search, [ ApiGetGifsSearchOptions? options, ]) async {
+    final locale = options?.locale;
+    final rating = options?.rating;
+    final page = options?.page;
     // ignore: prefer_const_declarations
     final path = r'/gifs/search/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1747,8 +1695,8 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsSearchResponse?> getGifsSearch(ApiGetGifsSearchRequest request,) async {
-    final response = await getGifsSearchWithHttpInfo(request,);
+  Future<GetGifsSearchResponse?> getGifsSearch(String tenantId, String search, [ ApiGetGifsSearchOptions? options, ]) async {
+    final response = await getGifsSearchWithHttpInfo(tenantId, search, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1772,11 +1720,10 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsTrendingWithHttpInfo(ApiGetGifsTrendingRequest request,) async {
-    final tenantId = request.tenantId;
-    final locale = request.locale;
-    final rating = request.rating;
-    final page = request.page;
+  Future<Response> getGifsTrendingWithHttpInfo(String tenantId, [ ApiGetGifsTrendingOptions? options, ]) async {
+    final locale = options?.locale;
+    final rating = options?.rating;
+    final page = options?.page;
     // ignore: prefer_const_declarations
     final path = r'/gifs/trending/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1821,8 +1768,8 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsTrendingResponse?> getGifsTrending(ApiGetGifsTrendingRequest request,) async {
-    final response = await getGifsTrendingWithHttpInfo(request,);
+  Future<GetGifsTrendingResponse?> getGifsTrending(String tenantId, [ ApiGetGifsTrendingOptions? options, ]) async {
+    final response = await getGifsTrendingWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1851,12 +1798,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getGlobalEventLogWithHttpInfo(ApiGetGlobalEventLogRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final userIdWS = request.userIdWS;
-    final startTime = request.startTime;
-    final endTime = request.endTime;
+  Future<Response> getGlobalEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetGlobalEventLogOptions? options, ]) async {
+    final endTime = options?.endTime;
     // ignore: prefer_const_declarations
     final path = r'/event-log/global/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1902,8 +1845,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getGlobalEventLog(ApiGetGlobalEventLogRequest request,) async {
-    final response = await getGlobalEventLogWithHttpInfo(request,);
+  Future<GetEventLogResponse?> getGlobalEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetGlobalEventLogOptions? options, ]) async {
+    final response = await getGlobalEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1933,11 +1876,9 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOfflineUsersWithHttpInfo(ApiGetOfflineUsersRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final afterName = request.afterName;
-    final afterUserId = request.afterUserId;
+  Future<Response> getOfflineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options, ]) async {
+    final afterName = options?.afterName;
+    final afterUserId = options?.afterUserId;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/offline'
       .replaceAll('{tenantId}', tenantId);
@@ -1985,8 +1926,8 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOfflineResponse?> getOfflineUsers(ApiGetOfflineUsersRequest request,) async {
-    final response = await getOfflineUsersWithHttpInfo(request,);
+  Future<PageUsersOfflineResponse?> getOfflineUsers(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options, ]) async {
+    final response = await getOfflineUsersWithHttpInfo(tenantId, urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2016,11 +1957,9 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOnlineUsersWithHttpInfo(ApiGetOnlineUsersRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final afterName = request.afterName;
-    final afterUserId = request.afterUserId;
+  Future<Response> getOnlineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options, ]) async {
+    final afterName = options?.afterName;
+    final afterUserId = options?.afterUserId;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/online'
       .replaceAll('{tenantId}', tenantId);
@@ -2068,8 +2007,8 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOnlineResponse?> getOnlineUsers(ApiGetOnlineUsersRequest request,) async {
-    final response = await getOnlineUsersWithHttpInfo(request,);
+  Future<PageUsersOnlineResponse?> getOnlineUsers(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options, ]) async {
+    final response = await getOnlineUsersWithHttpInfo(tenantId, urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2105,13 +2044,12 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<Response> getPagesPublicWithHttpInfo(ApiGetPagesPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final cursor = request.cursor;
-    final limit = request.limit;
-    final q = request.q;
-    final sortBy = request.sortBy;
-    final hasComments = request.hasComments;
+  Future<Response> getPagesPublicWithHttpInfo(String tenantId, [ ApiGetPagesPublicOptions? options, ]) async {
+    final cursor = options?.cursor;
+    final limit = options?.limit;
+    final q = options?.q;
+    final sortBy = options?.sortBy;
+    final hasComments = options?.hasComments;
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2173,8 +2111,8 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<GetPublicPagesResponse?> getPagesPublic(ApiGetPagesPublicRequest request,) async {
-    final response = await getPagesPublicWithHttpInfo(request,);
+  Future<GetPublicPagesResponse?> getPagesPublic(String tenantId, [ ApiGetPagesPublicOptions? options, ]) async {
+    final response = await getPagesPublicWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2198,11 +2136,9 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<Response> getTranslationsWithHttpInfo(ApiGetTranslationsRequest request,) async {
-    final namespace = request.namespace;
-    final component = request.component;
-    final locale = request.locale;
-    final useFullTranslationIds = request.useFullTranslationIds;
+  Future<Response> getTranslationsWithHttpInfo(String namespace, String component, [ ApiGetTranslationsOptions? options, ]) async {
+    final locale = options?.locale;
+    final useFullTranslationIds = options?.useFullTranslationIds;
     // ignore: prefer_const_declarations
     final path = r'/translations/{namespace}/{component}'
       .replaceAll('{namespace}', namespace)
@@ -2245,8 +2181,8 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<GetTranslationsResponse?> getTranslations(ApiGetTranslationsRequest request,) async {
-    final response = await getTranslationsWithHttpInfo(request,);
+  Future<GetTranslationsResponse?> getTranslations(String namespace, String component, [ ApiGetTranslationsOptions? options, ]) async {
+    final response = await getTranslationsWithHttpInfo(namespace, component, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2266,9 +2202,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationCountWithHttpInfo(ApiGetUserNotificationCountRequest request,) async {
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> getUserNotificationCountWithHttpInfo(String tenantId, [ ApiGetUserNotificationCountOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/get-count';
 
@@ -2303,8 +2238,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<GetUserNotificationCountResponse?> getUserNotificationCount(ApiGetUserNotificationCountRequest request,) async {
-    final response = await getUserNotificationCountWithHttpInfo(request,);
+  Future<GetUserNotificationCountResponse?> getUserNotificationCount(String tenantId, [ ApiGetUserNotificationCountOptions? options, ]) async {
+    final response = await getUserNotificationCountWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2345,19 +2280,18 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationsWithHttpInfo(ApiGetUserNotificationsRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final pageSize = request.pageSize;
-    final afterId = request.afterId;
-    final includeContext = request.includeContext;
-    final afterCreatedAt = request.afterCreatedAt;
-    final unreadOnly = request.unreadOnly;
-    final dmOnly = request.dmOnly;
-    final noDm = request.noDm;
-    final includeTranslations = request.includeTranslations;
-    final includeTenantNotifications = request.includeTenantNotifications;
-    final sso = request.sso;
+  Future<Response> getUserNotificationsWithHttpInfo(String tenantId, [ ApiGetUserNotificationsOptions? options, ]) async {
+    final urlId = options?.urlId;
+    final pageSize = options?.pageSize;
+    final afterId = options?.afterId;
+    final includeContext = options?.includeContext;
+    final afterCreatedAt = options?.afterCreatedAt;
+    final unreadOnly = options?.unreadOnly;
+    final dmOnly = options?.dmOnly;
+    final noDm = options?.noDm;
+    final includeTranslations = options?.includeTranslations;
+    final includeTenantNotifications = options?.includeTenantNotifications;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications';
 
@@ -2443,8 +2377,8 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<GetMyNotificationsResponse?> getUserNotifications(ApiGetUserNotificationsRequest request,) async {
-    final response = await getUserNotificationsWithHttpInfo(request,);
+  Future<GetMyNotificationsResponse?> getUserNotifications(String tenantId, [ ApiGetUserNotificationsOptions? options, ]) async {
+    final response = await getUserNotificationsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2466,10 +2400,7 @@ class PublicApi {
   /// * [String] urlIdWS (required):
   ///
   /// * [String] userIds (required):
-  Future<Response> getUserPresenceStatusesWithHttpInfo(ApiGetUserPresenceStatusesRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlIdWS = request.urlIdWS;
-    final userIds = request.userIds;
+  Future<Response> getUserPresenceStatusesWithHttpInfo(String tenantId, String urlIdWS, String userIds, ) async {
     // ignore: prefer_const_declarations
     final path = r'/user-presence-status';
 
@@ -2505,8 +2436,8 @@ class PublicApi {
   /// * [String] urlIdWS (required):
   ///
   /// * [String] userIds (required):
-  Future<GetUserPresenceStatusesResponse?> getUserPresenceStatuses(ApiGetUserPresenceStatusesRequest request,) async {
-    final response = await getUserPresenceStatusesWithHttpInfo(request,);
+  Future<GetUserPresenceStatusesResponse?> getUserPresenceStatuses(String tenantId, String urlIdWS, String userIds, ) async {
+    final response = await getUserPresenceStatusesWithHttpInfo(tenantId, urlIdWS, userIds, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2528,10 +2459,9 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<Response> getUserReactsPublicWithHttpInfo(ApiGetUserReactsPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final postIds = request.postIds;
-    final sso = request.sso;
+  Future<Response> getUserReactsPublicWithHttpInfo(String tenantId, [ ApiGetUserReactsPublicOptions? options, ]) async {
+    final postIds = options?.postIds;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/user-reacts'
       .replaceAll('{tenantId}', tenantId);
@@ -2571,8 +2501,8 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<UserReactsResponse?> getUserReactsPublic(ApiGetUserReactsPublicRequest request,) async {
-    final response = await getUserReactsPublicWithHttpInfo(request,);
+  Future<UserReactsResponse?> getUserReactsPublic(String tenantId, [ ApiGetUserReactsPublicOptions? options, ]) async {
+    final response = await getUserReactsPublicWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2596,9 +2526,7 @@ class PublicApi {
   ///
   /// * [String] ids (required):
   ///   Comma-delimited userIds.
-  Future<Response> getUsersInfoWithHttpInfo(ApiGetUsersInfoRequest request,) async {
-    final tenantId = request.tenantId;
-    final ids = request.ids;
+  Future<Response> getUsersInfoWithHttpInfo(String tenantId, String ids, ) async {
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/info'
       .replaceAll('{tenantId}', tenantId);
@@ -2634,8 +2562,8 @@ class PublicApi {
   ///
   /// * [String] ids (required):
   ///   Comma-delimited userIds.
-  Future<PageUsersInfoResponse?> getUsersInfo(ApiGetUsersInfoRequest request,) async {
-    final response = await getUsersInfoWithHttpInfo(request,);
+  Future<PageUsersInfoResponse?> getUsersInfo(String tenantId, String ids, ) async {
+    final response = await getUsersInfoWithHttpInfo(tenantId, ids, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2655,9 +2583,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getV1PageLikesWithHttpInfo(ApiGetV1PageLikesRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
+  Future<Response> getV1PageLikesWithHttpInfo(String tenantId, String urlId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2690,8 +2616,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetV1PageLikes?> getV1PageLikes(ApiGetV1PageLikesRequest request,) async {
-    final response = await getV1PageLikesWithHttpInfo(request,);
+  Future<GetV1PageLikes?> getV1PageLikes(String tenantId, String urlId, ) async {
+    final response = await getV1PageLikesWithHttpInfo(tenantId, urlId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2713,10 +2639,7 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getV2PageReactUsersWithHttpInfo(ApiGetV2PageReactUsersRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final id = request.id;
+  Future<Response> getV2PageReactUsersWithHttpInfo(String tenantId, String urlId, String id, ) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}/list'
       .replaceAll('{tenantId}', tenantId);
@@ -2752,8 +2675,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<GetV2PageReactUsersResponse?> getV2PageReactUsers(ApiGetV2PageReactUsersRequest request,) async {
-    final response = await getV2PageReactUsersWithHttpInfo(request,);
+  Future<GetV2PageReactUsersResponse?> getV2PageReactUsers(String tenantId, String urlId, String id, ) async {
+    final response = await getV2PageReactUsersWithHttpInfo(tenantId, urlId, id, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2773,9 +2696,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getV2PageReactsWithHttpInfo(ApiGetV2PageReactsRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
+  Future<Response> getV2PageReactsWithHttpInfo(String tenantId, String urlId, ) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2808,8 +2729,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetV2PageReacts?> getV2PageReacts(ApiGetV2PageReactsRequest request,) async {
-    final response = await getV2PageReactsWithHttpInfo(request,);
+  Future<GetV2PageReacts?> getV2PageReacts(String tenantId, String urlId, ) async {
+    final response = await getV2PageReactsWithHttpInfo(tenantId, urlId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2833,11 +2754,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> lockCommentWithHttpInfo(ApiLockCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> lockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiLockCommentOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/lock'
       .replaceAll('{tenantId}', tenantId)
@@ -2878,8 +2796,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> lockComment(ApiLockCommentRequest request,) async {
-    final response = await lockCommentWithHttpInfo(request,);
+  Future<APIEmptyResponse?> lockComment(String tenantId, String commentId, String broadcastId, [ ApiLockCommentOptions? options, ]) async {
+    final response = await lockCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2894,7 +2812,7 @@ class PublicApi {
   }
 
   /// Performs an HTTP 'PUT /auth/logout' operation and returns the [Response].
-  Future<Response> logoutPublicWithHttpInfo(ApiLogoutPublicRequest request,) async {
+  Future<Response> logoutPublicWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/auth/logout';
 
@@ -2919,8 +2837,8 @@ class PublicApi {
     );
   }
 
-  Future<APIEmptyResponse?> logoutPublic(ApiLogoutPublicRequest request,) async {
-    final response = await logoutPublicWithHttpInfo(request,);
+  Future<APIEmptyResponse?> logoutPublic() async {
+    final response = await logoutPublicWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2944,11 +2862,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> pinCommentWithHttpInfo(ApiPinCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> pinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiPinCommentOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/pin'
       .replaceAll('{tenantId}', tenantId)
@@ -2989,8 +2904,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> pinComment(ApiPinCommentRequest request,) async {
-    final response = await pinCommentWithHttpInfo(request,);
+  Future<ChangeCommentPinStatusResponse?> pinComment(String tenantId, String commentId, String broadcastId, [ ApiPinCommentOptions? options, ]) async {
+    final response = await pinCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3018,13 +2933,10 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> reactFeedPostPublicWithHttpInfo(ApiReactFeedPostPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final postId = request.postId;
-    final reactBodyParams = request.reactBodyParams;
-    final isUndo = request.isUndo;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> reactFeedPostPublicWithHttpInfo(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options, ]) async {
+    final isUndo = options?.isUndo;
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/react/{postId}'
       .replaceAll('{tenantId}', tenantId)
@@ -3074,8 +2986,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<ReactFeedPostResponse?> reactFeedPostPublic(ApiReactFeedPostPublicRequest request,) async {
-    final response = await reactFeedPostPublicWithHttpInfo(request,);
+  Future<ReactFeedPostResponse?> reactFeedPostPublic(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options, ]) async {
+    final response = await reactFeedPostPublicWithHttpInfo(tenantId, postId, reactBodyParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3095,9 +3007,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationCountWithHttpInfo(ApiResetUserNotificationCountRequest request,) async {
-    final tenantId = request.tenantId;
-    final sso = request.sso;
+  Future<Response> resetUserNotificationCountWithHttpInfo(String tenantId, [ ApiResetUserNotificationCountOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/reset-count';
 
@@ -3132,8 +3043,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(ApiResetUserNotificationCountRequest request,) async {
-    final response = await resetUserNotificationCountWithHttpInfo(request,);
+  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(String tenantId, [ ApiResetUserNotificationCountOptions? options, ]) async {
+    final response = await resetUserNotificationCountWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3163,14 +3074,13 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationsWithHttpInfo(ApiResetUserNotificationsRequest request,) async {
-    final tenantId = request.tenantId;
-    final afterId = request.afterId;
-    final afterCreatedAt = request.afterCreatedAt;
-    final unreadOnly = request.unreadOnly;
-    final dmOnly = request.dmOnly;
-    final noDm = request.noDm;
-    final sso = request.sso;
+  Future<Response> resetUserNotificationsWithHttpInfo(String tenantId, [ ApiResetUserNotificationsOptions? options, ]) async {
+    final afterId = options?.afterId;
+    final afterCreatedAt = options?.afterCreatedAt;
+    final unreadOnly = options?.unreadOnly;
+    final dmOnly = options?.dmOnly;
+    final noDm = options?.noDm;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/reset';
 
@@ -3230,8 +3140,8 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotifications(ApiResetUserNotificationsRequest request,) async {
-    final response = await resetUserNotificationsWithHttpInfo(request,);
+  Future<ResetUserNotificationsResponse?> resetUserNotifications(String tenantId, [ ApiResetUserNotificationsOptions? options, ]) async {
+    final response = await resetUserNotificationsWithHttpInfo(tenantId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3259,13 +3169,11 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<Response> searchUsersWithHttpInfo(ApiSearchUsersRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final usernameStartsWith = request.usernameStartsWith;
-    final mentionGroupIds = request.mentionGroupIds;
-    final sso = request.sso;
-    final searchSection = request.searchSection;
+  Future<Response> searchUsersWithHttpInfo(String tenantId, String urlId, [ ApiSearchUsersOptions? options, ]) async {
+    final usernameStartsWith = options?.usernameStartsWith;
+    final mentionGroupIds = options?.mentionGroupIds;
+    final sso = options?.sso;
+    final searchSection = options?.searchSection;
     // ignore: prefer_const_declarations
     final path = r'/user-search/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -3318,8 +3226,8 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<SearchUsersResult?> searchUsers(ApiSearchUsersRequest request,) async {
-    final response = await searchUsersWithHttpInfo(request,);
+  Future<SearchUsersResult?> searchUsers(String tenantId, String urlId, [ ApiSearchUsersOptions? options, ]) async {
+    final response = await searchUsersWithHttpInfo(tenantId, urlId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3347,13 +3255,9 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> setCommentTextWithHttpInfo(ApiSetCommentTextRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final broadcastId = request.broadcastId;
-    final commentTextUpdateRequest = request.commentTextUpdateRequest;
-    final editKey = request.editKey;
-    final sso = request.sso;
+  Future<Response> setCommentTextWithHttpInfo(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options, ]) async {
+    final editKey = options?.editKey;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/update-text'
       .replaceAll('{tenantId}', tenantId)
@@ -3401,8 +3305,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPISetCommentTextResponse?> setCommentText(ApiSetCommentTextRequest request,) async {
-    final response = await setCommentTextWithHttpInfo(request,);
+  Future<PublicAPISetCommentTextResponse?> setCommentText(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options, ]) async {
+    final response = await setCommentTextWithHttpInfo(tenantId, commentId, broadcastId, commentTextUpdateRequest, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3426,11 +3330,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> unBlockCommentPublicWithHttpInfo(ApiUnBlockCommentPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final publicBlockFromCommentParams = request.publicBlockFromCommentParams;
-    final sso = request.sso;
+  Future<Response> unBlockCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiUnBlockCommentPublicOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -3470,8 +3371,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<UnblockSuccess?> unBlockCommentPublic(ApiUnBlockCommentPublicRequest request,) async {
-    final response = await unBlockCommentPublicWithHttpInfo(request,);
+  Future<UnblockSuccess?> unBlockCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiUnBlockCommentPublicOptions? options, ]) async {
+    final response = await unBlockCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3495,11 +3396,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unLockCommentWithHttpInfo(ApiUnLockCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> unLockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiUnLockCommentOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unlock'
       .replaceAll('{tenantId}', tenantId)
@@ -3540,8 +3438,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> unLockComment(ApiUnLockCommentRequest request,) async {
-    final response = await unLockCommentWithHttpInfo(request,);
+  Future<APIEmptyResponse?> unLockComment(String tenantId, String commentId, String broadcastId, [ ApiUnLockCommentOptions? options, ]) async {
+    final response = await unLockCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3565,11 +3463,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unPinCommentWithHttpInfo(ApiUnPinCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> unPinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiUnPinCommentOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unpin'
       .replaceAll('{tenantId}', tenantId)
@@ -3610,8 +3505,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> unPinComment(ApiUnPinCommentRequest request,) async {
-    final response = await unPinCommentWithHttpInfo(request,);
+  Future<ChangeCommentPinStatusResponse?> unPinComment(String tenantId, String commentId, String broadcastId, [ ApiUnPinCommentOptions? options, ]) async {
+    final response = await unPinCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3637,12 +3532,9 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> updateFeedPostPublicWithHttpInfo(ApiUpdateFeedPostPublicRequest request,) async {
-    final tenantId = request.tenantId;
-    final postId = request.postId;
-    final updateFeedPostParams = request.updateFeedPostParams;
-    final broadcastId = request.broadcastId;
-    final sso = request.sso;
+  Future<Response> updateFeedPostPublicWithHttpInfo(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options, ]) async {
+    final broadcastId = options?.broadcastId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/{postId}'
       .replaceAll('{tenantId}', tenantId)
@@ -3687,8 +3579,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> updateFeedPostPublic(ApiUpdateFeedPostPublicRequest request,) async {
-    final response = await updateFeedPostPublicWithHttpInfo(request,);
+  Future<CreateFeedPostResponse?> updateFeedPostPublic(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options, ]) async {
+    final response = await updateFeedPostPublicWithHttpInfo(tenantId, postId, updateFeedPostParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3717,12 +3609,8 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(ApiUpdateUserNotificationCommentSubscriptionStatusRequest request,) async {
-    final tenantId = request.tenantId;
-    final notificationId = request.notificationId;
-    final optedInOrOut = request.optedInOrOut;
-    final commentId = request.commentId;
-    final sso = request.sso;
+  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(String tenantId, String notificationId, String optedInOrOut, String commentId, [ ApiUpdateUserNotificationCommentSubscriptionStatusOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark-opted/{optedInOrOut}'
       .replaceAll('{notificationId}', notificationId)
@@ -3768,8 +3656,8 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(ApiUpdateUserNotificationCommentSubscriptionStatusRequest request,) async {
-    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(request,);
+  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(String tenantId, String notificationId, String optedInOrOut, String commentId, [ ApiUpdateUserNotificationCommentSubscriptionStatusOptions? options, ]) async {
+    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(tenantId, notificationId, optedInOrOut, commentId, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3800,13 +3688,8 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(ApiUpdateUserNotificationPageSubscriptionStatusRequest request,) async {
-    final tenantId = request.tenantId;
-    final urlId = request.urlId;
-    final url = request.url;
-    final pageTitle = request.pageTitle;
-    final subscribedOrUnsubscribed = request.subscribedOrUnsubscribed;
-    final sso = request.sso;
+  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ ApiUpdateUserNotificationPageSubscriptionStatusOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/set-subscription-state/{subscribedOrUnsubscribed}'
       .replaceAll('{subscribedOrUnsubscribed}', subscribedOrUnsubscribed);
@@ -3855,8 +3738,8 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(ApiUpdateUserNotificationPageSubscriptionStatusRequest request,) async {
-    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(request,);
+  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ ApiUpdateUserNotificationPageSubscriptionStatusOptions? options, ]) async {
+    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3880,11 +3763,8 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationStatusWithHttpInfo(ApiUpdateUserNotificationStatusRequest request,) async {
-    final tenantId = request.tenantId;
-    final notificationId = request.notificationId;
-    final newStatus = request.newStatus;
-    final sso = request.sso;
+  Future<Response> updateUserNotificationStatusWithHttpInfo(String tenantId, String notificationId, String newStatus, [ ApiUpdateUserNotificationStatusOptions? options, ]) async {
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark/{newStatus}'
       .replaceAll('{notificationId}', notificationId)
@@ -3925,8 +3805,8 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(ApiUpdateUserNotificationStatusRequest request,) async {
-    final response = await updateUserNotificationStatusWithHttpInfo(request,);
+  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(String tenantId, String notificationId, String newStatus, [ ApiUpdateUserNotificationStatusOptions? options, ]) async {
+    final response = await updateUserNotificationStatusWithHttpInfo(tenantId, notificationId, newStatus, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3955,11 +3835,9 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<Response> uploadImageWithHttpInfo(ApiUploadImageRequest request,) async {
-    final tenantId = request.tenantId;
-    final file = request.file;
-    final sizePreset = request.sizePreset;
-    final urlId = request.urlId;
+  Future<Response> uploadImageWithHttpInfo(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options, ]) async {
+    final sizePreset = options?.sizePreset;
+    final urlId = options?.urlId;
     // ignore: prefer_const_declarations
     final path = r'/upload-image/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -4015,8 +3893,8 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<UploadImageResponse?> uploadImage(ApiUploadImageRequest request,) async {
-    final response = await uploadImageWithHttpInfo(request,);
+  Future<UploadImageResponse?> uploadImage(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options, ]) async {
+    final response = await uploadImageWithHttpInfo(tenantId, file, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4046,14 +3924,9 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> voteCommentWithHttpInfo(ApiVoteCommentRequest request,) async {
-    final tenantId = request.tenantId;
-    final commentId = request.commentId;
-    final urlId = request.urlId;
-    final broadcastId = request.broadcastId;
-    final voteBodyParams = request.voteBodyParams;
-    final sessionId = request.sessionId;
-    final sso = request.sso;
+  Future<Response> voteCommentWithHttpInfo(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options, ]) async {
+    final sessionId = options?.sessionId;
+    final sso = options?.sso;
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/vote'
       .replaceAll('{tenantId}', tenantId)
@@ -4104,8 +3977,8 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> voteComment(ApiVoteCommentRequest request,) async {
-    final response = await voteCommentWithHttpInfo(request,);
+  Future<VoteResponse?> voteComment(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options, ]) async {
+    final response = await voteCommentWithHttpInfo(tenantId, commentId, urlId, broadcastId, voteBodyParams, options,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4120,207 +3993,117 @@ class PublicApi {
   }
 }
 
-/// Request parameters for [PublicApi.blockFromCommentPublic].
-class ApiBlockFromCommentPublicRequest {
-  const ApiBlockFromCommentPublicRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.publicBlockFromCommentParams,
+/// Optional parameters for [PublicApi.blockFromCommentPublic].
+class ApiBlockFromCommentPublicOptions {
+  const ApiBlockFromCommentPublicOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final PublicBlockFromCommentParams publicBlockFromCommentParams;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.checkedCommentsForBlocked].
-class ApiCheckedCommentsForBlockedRequest {
-  const ApiCheckedCommentsForBlockedRequest({
-    required this.tenantId,
-    required this.commentIds,
+/// Optional parameters for [PublicApi.checkedCommentsForBlocked].
+class ApiCheckedCommentsForBlockedOptions {
+  const ApiCheckedCommentsForBlockedOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentIds;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.createCommentPublic].
-class ApiCreateCommentPublicRequest {
-  const ApiCreateCommentPublicRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.broadcastId,
-    required this.commentData,
+/// Optional parameters for [PublicApi.createCommentPublic].
+class ApiCreateCommentPublicOptions {
+  const ApiCreateCommentPublicOptions({
     this.sessionId,
     this.sso,
   });
-  final String tenantId;
-  final String urlId;
-  final String broadcastId;
-  final CommentData commentData;
   final String? sessionId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.createFeedPostPublic].
-class ApiCreateFeedPostPublicRequest {
-  const ApiCreateFeedPostPublicRequest({
-    required this.tenantId,
-    required this.createFeedPostParams,
+/// Optional parameters for [PublicApi.createFeedPostPublic].
+class ApiCreateFeedPostPublicOptions {
+  const ApiCreateFeedPostPublicOptions({
     this.broadcastId,
     this.sso,
   });
-  final String tenantId;
-  final CreateFeedPostParams createFeedPostParams;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.createV1PageReact].
-class ApiCreateV1PageReactRequest {
-  const ApiCreateV1PageReactRequest({
-    required this.tenantId,
-    required this.urlId,
+/// Optional parameters for [PublicApi.createV1PageReact].
+class ApiCreateV1PageReactOptions {
+  const ApiCreateV1PageReactOptions({
     this.title,
   });
-  final String tenantId;
-  final String urlId;
   final String? title;
 }
 
-/// Request parameters for [PublicApi.createV2PageReact].
-class ApiCreateV2PageReactRequest {
-  const ApiCreateV2PageReactRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.id,
+/// Optional parameters for [PublicApi.createV2PageReact].
+class ApiCreateV2PageReactOptions {
+  const ApiCreateV2PageReactOptions({
     this.title,
   });
-  final String tenantId;
-  final String urlId;
-  final String id;
   final String? title;
 }
 
-/// Request parameters for [PublicApi.deleteCommentPublic].
-class ApiDeleteCommentPublicRequest {
-  const ApiDeleteCommentPublicRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.broadcastId,
+/// Optional parameters for [PublicApi.deleteCommentPublic].
+class ApiDeleteCommentPublicOptions {
+  const ApiDeleteCommentPublicOptions({
     this.editKey,
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String broadcastId;
   final String? editKey;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.deleteCommentVote].
-class ApiDeleteCommentVoteRequest {
-  const ApiDeleteCommentVoteRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.voteId,
-    required this.urlId,
-    required this.broadcastId,
+/// Optional parameters for [PublicApi.deleteCommentVote].
+class ApiDeleteCommentVoteOptions {
+  const ApiDeleteCommentVoteOptions({
     this.editKey,
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String voteId;
-  final String urlId;
-  final String broadcastId;
   final String? editKey;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.deleteFeedPostPublic].
-class ApiDeleteFeedPostPublicRequest {
-  const ApiDeleteFeedPostPublicRequest({
-    required this.tenantId,
-    required this.postId,
+/// Optional parameters for [PublicApi.deleteFeedPostPublic].
+class ApiDeleteFeedPostPublicOptions {
+  const ApiDeleteFeedPostPublicOptions({
     this.broadcastId,
     this.sso,
   });
-  final String tenantId;
-  final String postId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.deleteV1PageReact].
-class ApiDeleteV1PageReactRequest {
-  const ApiDeleteV1PageReactRequest({
-    required this.tenantId,
-    required this.urlId,
-  });
-  final String tenantId;
-  final String urlId;
-}
-
-/// Request parameters for [PublicApi.deleteV2PageReact].
-class ApiDeleteV2PageReactRequest {
-  const ApiDeleteV2PageReactRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.id,
-  });
-  final String tenantId;
-  final String urlId;
-  final String id;
-}
-
-/// Request parameters for [PublicApi.flagCommentPublic].
-class ApiFlagCommentPublicRequest {
-  const ApiFlagCommentPublicRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.isFlagged,
+/// Optional parameters for [PublicApi.flagCommentPublic].
+class ApiFlagCommentPublicOptions {
+  const ApiFlagCommentPublicOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final bool isFlagged;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getCommentText].
-class ApiGetCommentTextRequest {
-  const ApiGetCommentTextRequest({
-    required this.tenantId,
-    required this.commentId,
+/// Optional parameters for [PublicApi.getCommentText].
+class ApiGetCommentTextOptions {
+  const ApiGetCommentTextOptions({
     this.editKey,
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
   final String? editKey;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getCommentVoteUserNames].
-class ApiGetCommentVoteUserNamesRequest {
-  const ApiGetCommentVoteUserNamesRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.dir,
+/// Optional parameters for [PublicApi.getCommentVoteUserNames].
+class ApiGetCommentVoteUserNamesOptions {
+  const ApiGetCommentVoteUserNamesOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final int dir;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getCommentsForUser].
-class ApiGetCommentsForUserRequest {
-  const ApiGetCommentsForUserRequest({
+/// Optional parameters for [PublicApi.getCommentsForUser].
+class ApiGetCommentsForUserOptions {
+  const ApiGetCommentsForUserOptions({
     this.userId,
     this.direction,
     this.repliesToUserId,
@@ -4338,11 +4121,9 @@ class ApiGetCommentsForUserRequest {
   final bool? isCrawler;
 }
 
-/// Request parameters for [PublicApi.getCommentsPublic].
-class ApiGetCommentsPublicRequest {
-  const ApiGetCommentsPublicRequest({
-    required this.tenantId,
-    required this.urlId,
+/// Optional parameters for [PublicApi.getCommentsPublic].
+class ApiGetCommentsPublicOptions {
+  const ApiGetCommentsPublicOptions({
     this.page,
     this.direction,
     this.sso,
@@ -4370,8 +4151,6 @@ class ApiGetCommentsPublicRequest {
     this.afterCommentId,
     this.beforeCommentId,
   });
-  final String tenantId;
-  final String urlId;
   final int? page;
   final SortDirections? direction;
   final String? sso;
@@ -4400,26 +4179,17 @@ class ApiGetCommentsPublicRequest {
   final String? beforeCommentId;
 }
 
-/// Request parameters for [PublicApi.getEventLog].
-class ApiGetEventLogRequest {
-  const ApiGetEventLogRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.userIdWS,
-    required this.startTime,
+/// Optional parameters for [PublicApi.getEventLog].
+class ApiGetEventLogOptions {
+  const ApiGetEventLogOptions({
     this.endTime,
   });
-  final String tenantId;
-  final String urlId;
-  final String userIdWS;
-  final int startTime;
   final int? endTime;
 }
 
-/// Request parameters for [PublicApi.getFeedPostsPublic].
-class ApiGetFeedPostsPublicRequest {
-  const ApiGetFeedPostsPublicRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.getFeedPostsPublic].
+class ApiGetFeedPostsPublicOptions {
+  const ApiGetFeedPostsPublicOptions({
     this.afterId,
     this.limit,
     this.tags,
@@ -4427,7 +4197,6 @@ class ApiGetFeedPostsPublicRequest {
     this.isCrawler,
     this.includeUserInfo,
   });
-  final String tenantId;
   final String? afterId;
   final int? limit;
   final List<String>? tags;
@@ -4436,113 +4205,75 @@ class ApiGetFeedPostsPublicRequest {
   final bool? includeUserInfo;
 }
 
-/// Request parameters for [PublicApi.getFeedPostsStats].
-class ApiGetFeedPostsStatsRequest {
-  const ApiGetFeedPostsStatsRequest({
-    required this.tenantId,
-    required this.postIds,
+/// Optional parameters for [PublicApi.getFeedPostsStats].
+class ApiGetFeedPostsStatsOptions {
+  const ApiGetFeedPostsStatsOptions({
     this.sso,
   });
-  final String tenantId;
-  final List<String> postIds;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getGifLarge].
-class ApiGetGifLargeRequest {
-  const ApiGetGifLargeRequest({
-    required this.tenantId,
-    required this.largeInternalURLSanitized,
-  });
-  final String tenantId;
-  final String largeInternalURLSanitized;
-}
-
-/// Request parameters for [PublicApi.getGifsSearch].
-class ApiGetGifsSearchRequest {
-  const ApiGetGifsSearchRequest({
-    required this.tenantId,
-    required this.search,
+/// Optional parameters for [PublicApi.getGifsSearch].
+class ApiGetGifsSearchOptions {
+  const ApiGetGifsSearchOptions({
     this.locale,
     this.rating,
     this.page,
   });
-  final String tenantId;
-  final String search;
   final String? locale;
   final String? rating;
   final double? page;
 }
 
-/// Request parameters for [PublicApi.getGifsTrending].
-class ApiGetGifsTrendingRequest {
-  const ApiGetGifsTrendingRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.getGifsTrending].
+class ApiGetGifsTrendingOptions {
+  const ApiGetGifsTrendingOptions({
     this.locale,
     this.rating,
     this.page,
   });
-  final String tenantId;
   final String? locale;
   final String? rating;
   final double? page;
 }
 
-/// Request parameters for [PublicApi.getGlobalEventLog].
-class ApiGetGlobalEventLogRequest {
-  const ApiGetGlobalEventLogRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.userIdWS,
-    required this.startTime,
+/// Optional parameters for [PublicApi.getGlobalEventLog].
+class ApiGetGlobalEventLogOptions {
+  const ApiGetGlobalEventLogOptions({
     this.endTime,
   });
-  final String tenantId;
-  final String urlId;
-  final String userIdWS;
-  final int startTime;
   final int? endTime;
 }
 
-/// Request parameters for [PublicApi.getOfflineUsers].
-class ApiGetOfflineUsersRequest {
-  const ApiGetOfflineUsersRequest({
-    required this.tenantId,
-    required this.urlId,
+/// Optional parameters for [PublicApi.getOfflineUsers].
+class ApiGetOfflineUsersOptions {
+  const ApiGetOfflineUsersOptions({
     this.afterName,
     this.afterUserId,
   });
-  final String tenantId;
-  final String urlId;
   final String? afterName;
   final String? afterUserId;
 }
 
-/// Request parameters for [PublicApi.getOnlineUsers].
-class ApiGetOnlineUsersRequest {
-  const ApiGetOnlineUsersRequest({
-    required this.tenantId,
-    required this.urlId,
+/// Optional parameters for [PublicApi.getOnlineUsers].
+class ApiGetOnlineUsersOptions {
+  const ApiGetOnlineUsersOptions({
     this.afterName,
     this.afterUserId,
   });
-  final String tenantId;
-  final String urlId;
   final String? afterName;
   final String? afterUserId;
 }
 
-/// Request parameters for [PublicApi.getPagesPublic].
-class ApiGetPagesPublicRequest {
-  const ApiGetPagesPublicRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.getPagesPublic].
+class ApiGetPagesPublicOptions {
+  const ApiGetPagesPublicOptions({
     this.cursor,
     this.limit,
     this.q,
     this.sortBy,
     this.hasComments,
   });
-  final String tenantId;
   final String? cursor;
   final int? limit;
   final String? q;
@@ -4550,34 +4281,27 @@ class ApiGetPagesPublicRequest {
   final bool? hasComments;
 }
 
-/// Request parameters for [PublicApi.getTranslations].
-class ApiGetTranslationsRequest {
-  const ApiGetTranslationsRequest({
-    required this.namespace,
-    required this.component,
+/// Optional parameters for [PublicApi.getTranslations].
+class ApiGetTranslationsOptions {
+  const ApiGetTranslationsOptions({
     this.locale,
     this.useFullTranslationIds,
   });
-  final String namespace;
-  final String component;
   final String? locale;
   final bool? useFullTranslationIds;
 }
 
-/// Request parameters for [PublicApi.getUserNotificationCount].
-class ApiGetUserNotificationCountRequest {
-  const ApiGetUserNotificationCountRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.getUserNotificationCount].
+class ApiGetUserNotificationCountOptions {
+  const ApiGetUserNotificationCountOptions({
     this.sso,
   });
-  final String tenantId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getUserNotifications].
-class ApiGetUserNotificationsRequest {
-  const ApiGetUserNotificationsRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.getUserNotifications].
+class ApiGetUserNotificationsOptions {
+  const ApiGetUserNotificationsOptions({
     this.urlId,
     this.pageSize,
     this.afterId,
@@ -4590,7 +4314,6 @@ class ApiGetUserNotificationsRequest {
     this.includeTenantNotifications,
     this.sso,
   });
-  final String tenantId;
   final String? urlId;
   final int? pageSize;
   final String? afterId;
@@ -4604,137 +4327,55 @@ class ApiGetUserNotificationsRequest {
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getUserPresenceStatuses].
-class ApiGetUserPresenceStatusesRequest {
-  const ApiGetUserPresenceStatusesRequest({
-    required this.tenantId,
-    required this.urlIdWS,
-    required this.userIds,
-  });
-  final String tenantId;
-  final String urlIdWS;
-  final String userIds;
-}
-
-/// Request parameters for [PublicApi.getUserReactsPublic].
-class ApiGetUserReactsPublicRequest {
-  const ApiGetUserReactsPublicRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.getUserReactsPublic].
+class ApiGetUserReactsPublicOptions {
+  const ApiGetUserReactsPublicOptions({
     this.postIds,
     this.sso,
   });
-  final String tenantId;
   final List<String>? postIds;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.getUsersInfo].
-class ApiGetUsersInfoRequest {
-  const ApiGetUsersInfoRequest({
-    required this.tenantId,
-    required this.ids,
-  });
-  final String tenantId;
-  final String ids;
-}
-
-/// Request parameters for [PublicApi.getV1PageLikes].
-class ApiGetV1PageLikesRequest {
-  const ApiGetV1PageLikesRequest({
-    required this.tenantId,
-    required this.urlId,
-  });
-  final String tenantId;
-  final String urlId;
-}
-
-/// Request parameters for [PublicApi.getV2PageReactUsers].
-class ApiGetV2PageReactUsersRequest {
-  const ApiGetV2PageReactUsersRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.id,
-  });
-  final String tenantId;
-  final String urlId;
-  final String id;
-}
-
-/// Request parameters for [PublicApi.getV2PageReacts].
-class ApiGetV2PageReactsRequest {
-  const ApiGetV2PageReactsRequest({
-    required this.tenantId,
-    required this.urlId,
-  });
-  final String tenantId;
-  final String urlId;
-}
-
-/// Request parameters for [PublicApi.lockComment].
-class ApiLockCommentRequest {
-  const ApiLockCommentRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.broadcastId,
+/// Optional parameters for [PublicApi.lockComment].
+class ApiLockCommentOptions {
+  const ApiLockCommentOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.logoutPublic].
-class ApiLogoutPublicRequest {
-  const ApiLogoutPublicRequest();
-}
-
-/// Request parameters for [PublicApi.pinComment].
-class ApiPinCommentRequest {
-  const ApiPinCommentRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.broadcastId,
+/// Optional parameters for [PublicApi.pinComment].
+class ApiPinCommentOptions {
+  const ApiPinCommentOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.reactFeedPostPublic].
-class ApiReactFeedPostPublicRequest {
-  const ApiReactFeedPostPublicRequest({
-    required this.tenantId,
-    required this.postId,
-    required this.reactBodyParams,
+/// Optional parameters for [PublicApi.reactFeedPostPublic].
+class ApiReactFeedPostPublicOptions {
+  const ApiReactFeedPostPublicOptions({
     this.isUndo,
     this.broadcastId,
     this.sso,
   });
-  final String tenantId;
-  final String postId;
-  final ReactBodyParams reactBodyParams;
   final bool? isUndo;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.resetUserNotificationCount].
-class ApiResetUserNotificationCountRequest {
-  const ApiResetUserNotificationCountRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.resetUserNotificationCount].
+class ApiResetUserNotificationCountOptions {
+  const ApiResetUserNotificationCountOptions({
     this.sso,
   });
-  final String tenantId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.resetUserNotifications].
-class ApiResetUserNotificationsRequest {
-  const ApiResetUserNotificationsRequest({
-    required this.tenantId,
+/// Optional parameters for [PublicApi.resetUserNotifications].
+class ApiResetUserNotificationsOptions {
+  const ApiResetUserNotificationsOptions({
     this.afterId,
     this.afterCreatedAt,
     this.unreadOnly,
@@ -4742,7 +4383,6 @@ class ApiResetUserNotificationsRequest {
     this.noDm,
     this.sso,
   });
-  final String tenantId;
   final String? afterId;
   final int? afterCreatedAt;
   final bool? unreadOnly;
@@ -4751,178 +4391,104 @@ class ApiResetUserNotificationsRequest {
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.searchUsers].
-class ApiSearchUsersRequest {
-  const ApiSearchUsersRequest({
-    required this.tenantId,
-    required this.urlId,
+/// Optional parameters for [PublicApi.searchUsers].
+class ApiSearchUsersOptions {
+  const ApiSearchUsersOptions({
     this.usernameStartsWith,
     this.mentionGroupIds,
     this.sso,
     this.searchSection,
   });
-  final String tenantId;
-  final String urlId;
   final String? usernameStartsWith;
   final List<String>? mentionGroupIds;
   final String? sso;
   final String? searchSection;
 }
 
-/// Request parameters for [PublicApi.setCommentText].
-class ApiSetCommentTextRequest {
-  const ApiSetCommentTextRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.broadcastId,
-    required this.commentTextUpdateRequest,
+/// Optional parameters for [PublicApi.setCommentText].
+class ApiSetCommentTextOptions {
+  const ApiSetCommentTextOptions({
     this.editKey,
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String broadcastId;
-  final CommentTextUpdateRequest commentTextUpdateRequest;
   final String? editKey;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.unBlockCommentPublic].
-class ApiUnBlockCommentPublicRequest {
-  const ApiUnBlockCommentPublicRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.publicBlockFromCommentParams,
+/// Optional parameters for [PublicApi.unBlockCommentPublic].
+class ApiUnBlockCommentPublicOptions {
+  const ApiUnBlockCommentPublicOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final PublicBlockFromCommentParams publicBlockFromCommentParams;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.unLockComment].
-class ApiUnLockCommentRequest {
-  const ApiUnLockCommentRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.broadcastId,
+/// Optional parameters for [PublicApi.unLockComment].
+class ApiUnLockCommentOptions {
+  const ApiUnLockCommentOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.unPinComment].
-class ApiUnPinCommentRequest {
-  const ApiUnPinCommentRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.broadcastId,
+/// Optional parameters for [PublicApi.unPinComment].
+class ApiUnPinCommentOptions {
+  const ApiUnPinCommentOptions({
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.updateFeedPostPublic].
-class ApiUpdateFeedPostPublicRequest {
-  const ApiUpdateFeedPostPublicRequest({
-    required this.tenantId,
-    required this.postId,
-    required this.updateFeedPostParams,
+/// Optional parameters for [PublicApi.updateFeedPostPublic].
+class ApiUpdateFeedPostPublicOptions {
+  const ApiUpdateFeedPostPublicOptions({
     this.broadcastId,
     this.sso,
   });
-  final String tenantId;
-  final String postId;
-  final UpdateFeedPostParams updateFeedPostParams;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.updateUserNotificationCommentSubscriptionStatus].
-class ApiUpdateUserNotificationCommentSubscriptionStatusRequest {
-  const ApiUpdateUserNotificationCommentSubscriptionStatusRequest({
-    required this.tenantId,
-    required this.notificationId,
-    required this.optedInOrOut,
-    required this.commentId,
+/// Optional parameters for [PublicApi.updateUserNotificationCommentSubscriptionStatus].
+class ApiUpdateUserNotificationCommentSubscriptionStatusOptions {
+  const ApiUpdateUserNotificationCommentSubscriptionStatusOptions({
     this.sso,
   });
-  final String tenantId;
-  final String notificationId;
-  final String optedInOrOut;
-  final String commentId;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.updateUserNotificationPageSubscriptionStatus].
-class ApiUpdateUserNotificationPageSubscriptionStatusRequest {
-  const ApiUpdateUserNotificationPageSubscriptionStatusRequest({
-    required this.tenantId,
-    required this.urlId,
-    required this.url,
-    required this.pageTitle,
-    required this.subscribedOrUnsubscribed,
+/// Optional parameters for [PublicApi.updateUserNotificationPageSubscriptionStatus].
+class ApiUpdateUserNotificationPageSubscriptionStatusOptions {
+  const ApiUpdateUserNotificationPageSubscriptionStatusOptions({
     this.sso,
   });
-  final String tenantId;
-  final String urlId;
-  final String url;
-  final String pageTitle;
-  final String subscribedOrUnsubscribed;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.updateUserNotificationStatus].
-class ApiUpdateUserNotificationStatusRequest {
-  const ApiUpdateUserNotificationStatusRequest({
-    required this.tenantId,
-    required this.notificationId,
-    required this.newStatus,
+/// Optional parameters for [PublicApi.updateUserNotificationStatus].
+class ApiUpdateUserNotificationStatusOptions {
+  const ApiUpdateUserNotificationStatusOptions({
     this.sso,
   });
-  final String tenantId;
-  final String notificationId;
-  final String newStatus;
   final String? sso;
 }
 
-/// Request parameters for [PublicApi.uploadImage].
-class ApiUploadImageRequest {
-  const ApiUploadImageRequest({
-    required this.tenantId,
-    required this.file,
+/// Optional parameters for [PublicApi.uploadImage].
+class ApiUploadImageOptions {
+  const ApiUploadImageOptions({
     this.sizePreset,
     this.urlId,
   });
-  final String tenantId;
-  final MultipartFile file;
   final SizePreset? sizePreset;
   final String? urlId;
 }
 
-/// Request parameters for [PublicApi.voteComment].
-class ApiVoteCommentRequest {
-  const ApiVoteCommentRequest({
-    required this.tenantId,
-    required this.commentId,
-    required this.urlId,
-    required this.broadcastId,
-    required this.voteBodyParams,
+/// Optional parameters for [PublicApi.voteComment].
+class ApiVoteCommentOptions {
+  const ApiVoteCommentOptions({
     this.sessionId,
     this.sso,
   });
-  final String tenantId;
-  final String commentId;
-  final String urlId;
-  final String broadcastId;
-  final VoteBodyParams voteBodyParams;
   final String? sessionId;
   final String? sso;
 }
diff --git a/sso_tests/test/sso_integration_test.dart b/sso_tests/test/sso_integration_test.dart
index c0ea9bd..74cd07a 100644
--- a/sso_tests/test/sso_integration_test.dart
+++ b/sso_tests/test/sso_integration_test.dart
@@ -38,23 +38,23 @@ void main() {
       urlId: urlId,
     );
 
-    final createResponse = await api.createCommentPublic(ApiCreateCommentPublicRequest(
-      tenantId: tenantId!,
-      urlId: urlId,
-      broadcastId: 'dart-test-$timestamp',
-      commentData: commentData,
-      sso: token,
-    ));
+    final createResponse = await api.createCommentPublic(
+      tenantId!,
+      urlId,
+      'dart-test-$timestamp',
+      commentData,
+      ApiCreateCommentPublicOptions(sso: token),
+    );
     expect(createResponse, isNotNull);
     expect(createResponse!.status, APIStatus.success);
     expect(createResponse.comment.commenterName, user.username);
     expect(createResponse.comment.commentHTML, contains(commentText));
 
-    final getResponse = await api.getCommentsPublic(ApiGetCommentsPublicRequest(
-      tenantId: tenantId,
-      urlId: urlId,
-      sso: token,
-    ));
+    final getResponse = await api.getCommentsPublic(
+      tenantId,
+      urlId,
+      ApiGetCommentsPublicOptions(sso: token),
+    );
     expect(getResponse, isNotNull);
     expect(getResponse!.status, 'success');
     expect(getResponse.comments, isNotEmpty);

From 8d4723af36053addf6fb9c881402de2ce6825430 Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Tue, 23 Jun 2026 11:18:45 -0700
Subject: [PATCH 5/9] Regenerate: single optional is a direct param (no options
 object for one value)

Operations with exactly one optional now take it directly (e.g. deleteModerator(..., send_email)); the Api<Op>Options object is only used for 2+ optionals.
---
 client/doc/DefaultApi.md        | 108 ++++-----
 client/doc/PublicApi.md         |  76 +++---
 client/lib/api/default_api.dart | 405 +++++++-------------------------
 client/lib/api/public_api.dart  | 285 +++++-----------------
 4 files changed, 230 insertions(+), 644 deletions(-)

diff --git a/client/doc/DefaultApi.md b/client/doc/DefaultApi.md
index a66d445..d73675b 100644
--- a/client/doc/DefaultApi.md
+++ b/client/doc/DefaultApi.md
@@ -173,7 +173,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTag**
-> CreateHashTagResponse addHashTag(createHashTagBody, ApiAddHashTagOptions options)
+> CreateHashTagResponse addHashTag(createHashTagBody, tenantId)
 
 
 
@@ -190,7 +190,7 @@ final tenantId = tenantId_example; // String |
 final createHashTagBody = CreateHashTagBody(); // CreateHashTagBody | 
 
 try {
-    final result = api_instance.addHashTag(createHashTagBody, ApiAddHashTagOptions(tenantId: tenantId));
+    final result = api_instance.addHashTag(createHashTagBody, tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTag: $e\n');
@@ -220,7 +220,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTagsBulk**
-> BulkCreateHashTagsResponse addHashTagsBulk(bulkCreateHashTagsBody, ApiAddHashTagsBulkOptions options)
+> BulkCreateHashTagsResponse addHashTagsBulk(bulkCreateHashTagsBody, tenantId)
 
 
 
@@ -237,7 +237,7 @@ final tenantId = tenantId_example; // String |
 final bulkCreateHashTagsBody = BulkCreateHashTagsBody(); // BulkCreateHashTagsBody | 
 
 try {
-    final result = api_instance.addHashTagsBulk(bulkCreateHashTagsBody, ApiAddHashTagsBulkOptions(tenantId: tenantId));
+    final result = api_instance.addHashTagsBulk(bulkCreateHashTagsBody, tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTagsBulk: $e\n');
@@ -524,7 +524,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **bulkAggregateQuestionResults**
-> BulkAggregateQuestionResultsResponse bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, ApiBulkAggregateQuestionResultsOptions options)
+> BulkAggregateQuestionResultsResponse bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate)
 
 
 
@@ -542,7 +542,7 @@ final bulkAggregateQuestionResultsRequest = BulkAggregateQuestionResultsRequest(
 final forceRecalculate = true; // bool | 
 
 try {
-    final result = api_instance.bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, ApiBulkAggregateQuestionResultsOptions(forceRecalculate: forceRecalculate));
+    final result = api_instance.bulkAggregateQuestionResults(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->bulkAggregateQuestionResults: $e\n');
@@ -1459,7 +1459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteHashTag**
-> APIEmptyResponse deleteHashTag(tag, deleteHashTagRequestBody, ApiDeleteHashTagOptions options)
+> APIEmptyResponse deleteHashTag(tag, deleteHashTagRequestBody, tenantId)
 
 
 
@@ -1477,7 +1477,7 @@ final tenantId = tenantId_example; // String |
 final deleteHashTagRequestBody = DeleteHashTagRequestBody(); // DeleteHashTagRequestBody | 
 
 try {
-    final result = api_instance.deleteHashTag(tag, deleteHashTagRequestBody, ApiDeleteHashTagOptions(tenantId: tenantId));
+    final result = api_instance.deleteHashTag(tag, deleteHashTagRequestBody, tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteHashTag: $e\n');
@@ -1508,7 +1508,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteModerator**
-> APIEmptyResponse deleteModerator(tenantId, id, ApiDeleteModeratorOptions options)
+> APIEmptyResponse deleteModerator(tenantId, id, sendEmail)
 
 
 
@@ -1526,7 +1526,7 @@ final id = id_example; // String |
 final sendEmail = sendEmail_example; // String | 
 
 try {
-    final result = api_instance.deleteModerator(tenantId, id, ApiDeleteModeratorOptions(sendEmail: sendEmail));
+    final result = api_instance.deleteModerator(tenantId, id, sendEmail);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteModerator: $e\n');
@@ -1843,7 +1843,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteSubscription**
-> DeleteSubscriptionAPIResponse deleteSubscription(tenantId, id, ApiDeleteSubscriptionOptions options)
+> DeleteSubscriptionAPIResponse deleteSubscription(tenantId, id, userId)
 
 
 
@@ -1861,7 +1861,7 @@ final id = id_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.deleteSubscription(tenantId, id, ApiDeleteSubscriptionOptions(userId: userId));
+    final result = api_instance.deleteSubscription(tenantId, id, userId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteSubscription: $e\n');
@@ -1892,7 +1892,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenant**
-> APIEmptyResponse deleteTenant(tenantId, id, ApiDeleteTenantOptions options)
+> APIEmptyResponse deleteTenant(tenantId, id, sure)
 
 
 
@@ -1910,7 +1910,7 @@ final id = id_example; // String |
 final sure = sure_example; // String | 
 
 try {
-    final result = api_instance.deleteTenant(tenantId, id, ApiDeleteTenantOptions(sure: sure));
+    final result = api_instance.deleteTenant(tenantId, id, sure);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenant: $e\n');
@@ -2086,7 +2086,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteVote**
-> VoteDeleteResponse deleteVote(tenantId, id, ApiDeleteVoteOptions options)
+> VoteDeleteResponse deleteVote(tenantId, id, editKey)
 
 
 
@@ -2104,7 +2104,7 @@ final id = id_example; // String |
 final editKey = editKey_example; // String | 
 
 try {
-    final result = api_instance.deleteVote(tenantId, id, ApiDeleteVoteOptions(editKey: editKey));
+    final result = api_instance.deleteVote(tenantId, id, editKey);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteVote: $e\n');
@@ -2596,7 +2596,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplateRenderErrors**
-> GetEmailTemplateRenderErrorsResponse getEmailTemplateRenderErrors(tenantId, id, ApiGetEmailTemplateRenderErrorsOptions options)
+> GetEmailTemplateRenderErrorsResponse getEmailTemplateRenderErrors(tenantId, id, skip)
 
 
 
@@ -2614,7 +2614,7 @@ final id = id_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getEmailTemplateRenderErrors(tenantId, id, ApiGetEmailTemplateRenderErrorsOptions(skip: skip));
+    final result = api_instance.getEmailTemplateRenderErrors(tenantId, id, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplateRenderErrors: $e\n');
@@ -2645,7 +2645,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplates**
-> GetEmailTemplatesResponse getEmailTemplates(tenantId, ApiGetEmailTemplatesOptions options)
+> GetEmailTemplatesResponse getEmailTemplates(tenantId, skip)
 
 
 
@@ -2662,7 +2662,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getEmailTemplates(tenantId, ApiGetEmailTemplatesOptions(skip: skip));
+    final result = api_instance.getEmailTemplates(tenantId, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplates: $e\n');
@@ -2745,7 +2745,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getHashTags**
-> GetHashTagsResponse getHashTags(tenantId, ApiGetHashTagsOptions options)
+> GetHashTagsResponse getHashTags(tenantId, page)
 
 
 
@@ -2762,7 +2762,7 @@ final tenantId = tenantId_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getHashTags(tenantId, ApiGetHashTagsOptions(page: page));
+    final result = api_instance.getHashTags(tenantId, page);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getHashTags: $e\n');
@@ -2839,7 +2839,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerators**
-> GetModeratorsResponse getModerators(tenantId, ApiGetModeratorsOptions options)
+> GetModeratorsResponse getModerators(tenantId, skip)
 
 
 
@@ -2856,7 +2856,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getModerators(tenantId, ApiGetModeratorsOptions(skip: skip));
+    final result = api_instance.getModerators(tenantId, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getModerators: $e\n');
@@ -3253,7 +3253,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionConfigs**
-> GetQuestionConfigsResponse getQuestionConfigs(tenantId, ApiGetQuestionConfigsOptions options)
+> GetQuestionConfigsResponse getQuestionConfigs(tenantId, skip)
 
 
 
@@ -3270,7 +3270,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getQuestionConfigs(tenantId, ApiGetQuestionConfigsOptions(skip: skip));
+    final result = api_instance.getQuestionConfigs(tenantId, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionConfigs: $e\n');
@@ -3498,7 +3498,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUsers**
-> GetSSOUsersResponse getSSOUsers(tenantId, ApiGetSSOUsersOptions options)
+> GetSSOUsersResponse getSSOUsers(tenantId, skip)
 
 
 
@@ -3515,7 +3515,7 @@ final tenantId = tenantId_example; // String |
 final skip = 56; // int | 
 
 try {
-    final result = api_instance.getSSOUsers(tenantId, ApiGetSSOUsersOptions(skip: skip));
+    final result = api_instance.getSSOUsers(tenantId, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUsers: $e\n');
@@ -3545,7 +3545,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSubscriptions**
-> GetSubscriptionsAPIResponse getSubscriptions(tenantId, ApiGetSubscriptionsOptions options)
+> GetSubscriptionsAPIResponse getSubscriptions(tenantId, userId)
 
 
 
@@ -3562,7 +3562,7 @@ final tenantId = tenantId_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getSubscriptions(tenantId, ApiGetSubscriptionsOptions(userId: userId));
+    final result = api_instance.getSubscriptions(tenantId, userId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSubscriptions: $e\n');
@@ -3739,7 +3739,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantPackages**
-> GetTenantPackagesResponse getTenantPackages(tenantId, ApiGetTenantPackagesOptions options)
+> GetTenantPackagesResponse getTenantPackages(tenantId, skip)
 
 
 
@@ -3756,7 +3756,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantPackages(tenantId, ApiGetTenantPackagesOptions(skip: skip));
+    final result = api_instance.getTenantPackages(tenantId, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantPackages: $e\n');
@@ -3833,7 +3833,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantUsers**
-> GetTenantUsersResponse getTenantUsers(tenantId, ApiGetTenantUsersOptions options)
+> GetTenantUsersResponse getTenantUsers(tenantId, skip)
 
 
 
@@ -3850,7 +3850,7 @@ final tenantId = tenantId_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantUsers(tenantId, ApiGetTenantUsersOptions(skip: skip));
+    final result = api_instance.getTenantUsers(tenantId, skip);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantUsers: $e\n');
@@ -3929,7 +3929,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTicket**
-> GetTicketResponse getTicket(tenantId, id, ApiGetTicketOptions options)
+> GetTicketResponse getTicket(tenantId, id, userId)
 
 
 
@@ -3947,7 +3947,7 @@ final id = id_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getTicket(tenantId, id, ApiGetTicketOptions(userId: userId));
+    final result = api_instance.getTicket(tenantId, id, userId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTicket: $e\n');
@@ -4474,7 +4474,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchHashTag**
-> UpdateHashTagResponse patchHashTag(tag, updateHashTagBody, ApiPatchHashTagOptions options)
+> UpdateHashTagResponse patchHashTag(tag, updateHashTagBody, tenantId)
 
 
 
@@ -4492,7 +4492,7 @@ final tenantId = tenantId_example; // String |
 final updateHashTagBody = UpdateHashTagBody(); // UpdateHashTagBody | 
 
 try {
-    final result = api_instance.patchHashTag(tag, updateHashTagBody, ApiPatchHashTagOptions(tenantId: tenantId));
+    final result = api_instance.patchHashTag(tag, updateHashTagBody, tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchHashTag: $e\n');
@@ -4572,7 +4572,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchSSOUser**
-> PatchSSOUserAPIResponse patchSSOUser(tenantId, id, updateAPISSOUserData, ApiPatchSSOUserOptions options)
+> PatchSSOUserAPIResponse patchSSOUser(tenantId, id, updateAPISSOUserData, updateComments)
 
 
 
@@ -4591,7 +4591,7 @@ final updateAPISSOUserData = UpdateAPISSOUserData(); // UpdateAPISSOUserData |
 final updateComments = true; // bool | 
 
 try {
-    final result = api_instance.patchSSOUser(tenantId, id, updateAPISSOUserData, ApiPatchSSOUserOptions(updateComments: updateComments));
+    final result = api_instance.patchSSOUser(tenantId, id, updateAPISSOUserData, updateComments);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchSSOUser: $e\n');
@@ -4672,7 +4672,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putSSOUser**
-> PutSSOUserAPIResponse putSSOUser(tenantId, id, updateAPISSOUserData, ApiPutSSOUserOptions options)
+> PutSSOUserAPIResponse putSSOUser(tenantId, id, updateAPISSOUserData, updateComments)
 
 
 
@@ -4691,7 +4691,7 @@ final updateAPISSOUserData = UpdateAPISSOUserData(); // UpdateAPISSOUserData |
 final updateComments = true; // bool | 
 
 try {
-    final result = api_instance.putSSOUser(tenantId, id, updateAPISSOUserData, ApiPutSSOUserOptions(updateComments: updateComments));
+    final result = api_instance.putSSOUser(tenantId, id, updateAPISSOUserData, updateComments);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->putSSOUser: $e\n');
@@ -4723,7 +4723,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **renderEmailTemplate**
-> RenderEmailTemplateResponse renderEmailTemplate(tenantId, renderEmailTemplateBody, ApiRenderEmailTemplateOptions options)
+> RenderEmailTemplateResponse renderEmailTemplate(tenantId, renderEmailTemplateBody, locale)
 
 
 
@@ -4741,7 +4741,7 @@ final renderEmailTemplateBody = RenderEmailTemplateBody(); // RenderEmailTemplat
 final locale = locale_example; // String | 
 
 try {
-    final result = api_instance.renderEmailTemplate(tenantId, renderEmailTemplateBody, ApiRenderEmailTemplateOptions(locale: locale));
+    final result = api_instance.renderEmailTemplate(tenantId, renderEmailTemplateBody, locale);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->renderEmailTemplate: $e\n');
@@ -4821,7 +4821,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **replaceTenantUser**
-> APIEmptyResponse replaceTenantUser(tenantId, id, replaceTenantUserBody, ApiReplaceTenantUserOptions options)
+> APIEmptyResponse replaceTenantUser(tenantId, id, replaceTenantUserBody, updateComments)
 
 
 
@@ -4840,7 +4840,7 @@ final replaceTenantUserBody = ReplaceTenantUserBody(); // ReplaceTenantUserBody
 final updateComments = updateComments_example; // String | 
 
 try {
-    final result = api_instance.replaceTenantUser(tenantId, id, replaceTenantUserBody, ApiReplaceTenantUserOptions(updateComments: updateComments));
+    final result = api_instance.replaceTenantUser(tenantId, id, replaceTenantUserBody, updateComments);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->replaceTenantUser: $e\n');
@@ -5031,7 +5031,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **sendLoginLink**
-> APIEmptyResponse sendLoginLink(tenantId, id, ApiSendLoginLinkOptions options)
+> APIEmptyResponse sendLoginLink(tenantId, id, redirectURL)
 
 
 
@@ -5049,7 +5049,7 @@ final id = id_example; // String |
 final redirectURL = redirectURL_example; // String | 
 
 try {
-    final result = api_instance.sendLoginLink(tenantId, id, ApiSendLoginLinkOptions(redirectURL: redirectURL));
+    final result = api_instance.sendLoginLink(tenantId, id, redirectURL);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->sendLoginLink: $e\n');
@@ -5386,7 +5386,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateNotification**
-> APIEmptyResponse updateNotification(tenantId, id, updateNotificationBody, ApiUpdateNotificationOptions options)
+> APIEmptyResponse updateNotification(tenantId, id, updateNotificationBody, userId)
 
 
 
@@ -5405,7 +5405,7 @@ final updateNotificationBody = UpdateNotificationBody(); // UpdateNotificationBo
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.updateNotification(tenantId, id, updateNotificationBody, ApiUpdateNotificationOptions(userId: userId));
+    final result = api_instance.updateNotification(tenantId, id, updateNotificationBody, userId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateNotification: $e\n');
@@ -5535,7 +5535,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateSubscription**
-> UpdateSubscriptionAPIResponse updateSubscription(tenantId, id, updateAPIUserSubscriptionData, ApiUpdateSubscriptionOptions options)
+> UpdateSubscriptionAPIResponse updateSubscription(tenantId, id, updateAPIUserSubscriptionData, userId)
 
 
 
@@ -5554,7 +5554,7 @@ final updateAPIUserSubscriptionData = UpdateAPIUserSubscriptionData(); // Update
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.updateSubscription(tenantId, id, updateAPIUserSubscriptionData, ApiUpdateSubscriptionOptions(userId: userId));
+    final result = api_instance.updateSubscription(tenantId, id, updateAPIUserSubscriptionData, userId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateSubscription: $e\n');
@@ -5684,7 +5684,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenantUser**
-> APIEmptyResponse updateTenantUser(tenantId, id, updateTenantUserBody, ApiUpdateTenantUserOptions options)
+> APIEmptyResponse updateTenantUser(tenantId, id, updateTenantUserBody, updateComments)
 
 
 
@@ -5703,7 +5703,7 @@ final updateTenantUserBody = UpdateTenantUserBody(); // UpdateTenantUserBody |
 final updateComments = updateComments_example; // String | 
 
 try {
-    final result = api_instance.updateTenantUser(tenantId, id, updateTenantUserBody, ApiUpdateTenantUserOptions(updateComments: updateComments));
+    final result = api_instance.updateTenantUser(tenantId, id, updateTenantUserBody, updateComments);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenantUser: $e\n');
diff --git a/client/doc/PublicApi.md b/client/doc/PublicApi.md
index b297dfd..2bff1a0 100644
--- a/client/doc/PublicApi.md
+++ b/client/doc/PublicApi.md
@@ -64,7 +64,7 @@ Method | HTTP request | Description
 
 
 # **blockFromCommentPublic**
-> BlockSuccess blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiBlockFromCommentPublicOptions options)
+> BlockSuccess blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso)
 
 
 
@@ -79,7 +79,7 @@ final publicBlockFromCommentParams = PublicBlockFromCommentParams(); // PublicBl
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiBlockFromCommentPublicOptions(sso: sso));
+    final result = api_instance.blockFromCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->blockFromCommentPublic: $e\n');
@@ -111,7 +111,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **checkedCommentsForBlocked**
-> CheckBlockedCommentsResponse checkedCommentsForBlocked(tenantId, commentIds, ApiCheckedCommentsForBlockedOptions options)
+> CheckBlockedCommentsResponse checkedCommentsForBlocked(tenantId, commentIds, sso)
 
 
 
@@ -125,7 +125,7 @@ final commentIds = commentIds_example; // String | A comma separated list of com
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.checkedCommentsForBlocked(tenantId, commentIds, ApiCheckedCommentsForBlockedOptions(sso: sso));
+    final result = api_instance.checkedCommentsForBlocked(tenantId, commentIds, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->checkedCommentsForBlocked: $e\n');
@@ -254,7 +254,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createV1PageReact**
-> CreateV1PageReact createV1PageReact(tenantId, urlId, ApiCreateV1PageReactOptions options)
+> CreateV1PageReact createV1PageReact(tenantId, urlId, title)
 
 
 
@@ -268,7 +268,7 @@ final urlId = urlId_example; // String |
 final title = title_example; // String | 
 
 try {
-    final result = api_instance.createV1PageReact(tenantId, urlId, ApiCreateV1PageReactOptions(title: title));
+    final result = api_instance.createV1PageReact(tenantId, urlId, title);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createV1PageReact: $e\n');
@@ -299,7 +299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createV2PageReact**
-> CreateV1PageReact createV2PageReact(tenantId, urlId, id, ApiCreateV2PageReactOptions options)
+> CreateV1PageReact createV2PageReact(tenantId, urlId, id, title)
 
 
 
@@ -314,7 +314,7 @@ final id = id_example; // String |
 final title = title_example; // String | 
 
 try {
-    final result = api_instance.createV2PageReact(tenantId, urlId, id, ApiCreateV2PageReactOptions(title: title));
+    final result = api_instance.createV2PageReact(tenantId, urlId, id, title);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createV2PageReact: $e\n');
@@ -583,7 +583,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **flagCommentPublic**
-> APIEmptyResponse flagCommentPublic(tenantId, commentId, isFlagged, ApiFlagCommentPublicOptions options)
+> APIEmptyResponse flagCommentPublic(tenantId, commentId, isFlagged, sso)
 
 
 
@@ -598,7 +598,7 @@ final isFlagged = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.flagCommentPublic(tenantId, commentId, isFlagged, ApiFlagCommentPublicOptions(sso: sso));
+    final result = api_instance.flagCommentPublic(tenantId, commentId, isFlagged, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->flagCommentPublic: $e\n');
@@ -677,7 +677,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentVoteUserNames**
-> GetCommentVoteUserNamesSuccessResponse getCommentVoteUserNames(tenantId, commentId, dir, ApiGetCommentVoteUserNamesOptions options)
+> GetCommentVoteUserNamesSuccessResponse getCommentVoteUserNames(tenantId, commentId, dir, sso)
 
 
 
@@ -692,7 +692,7 @@ final dir = 56; // int |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentVoteUserNames(tenantId, commentId, dir, ApiGetCommentVoteUserNamesOptions(sso: sso));
+    final result = api_instance.getCommentVoteUserNames(tenantId, commentId, dir, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentVoteUserNames: $e\n');
@@ -874,7 +874,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEventLog**
-> GetEventLogResponse getEventLog(tenantId, urlId, userIdWS, startTime, ApiGetEventLogOptions options)
+> GetEventLogResponse getEventLog(tenantId, urlId, userIdWS, startTime, endTime)
 
 
 
@@ -892,7 +892,7 @@ final startTime = 789; // int |
 final endTime = 789; // int | 
 
 try {
-    final result = api_instance.getEventLog(tenantId, urlId, userIdWS, startTime, ApiGetEventLogOptions(endTime: endTime));
+    final result = api_instance.getEventLog(tenantId, urlId, userIdWS, startTime, endTime);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getEventLog: $e\n');
@@ -980,7 +980,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPostsStats**
-> FeedPostsStatsResponse getFeedPostsStats(tenantId, postIds, ApiGetFeedPostsStatsOptions options)
+> FeedPostsStatsResponse getFeedPostsStats(tenantId, postIds, sso)
 
 
 
@@ -994,7 +994,7 @@ final postIds = []; // List<String> |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getFeedPostsStats(tenantId, postIds, ApiGetFeedPostsStatsOptions(sso: sso));
+    final result = api_instance.getFeedPostsStats(tenantId, postIds, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getFeedPostsStats: $e\n');
@@ -1164,7 +1164,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGlobalEventLog**
-> GetEventLogResponse getGlobalEventLog(tenantId, urlId, userIdWS, startTime, ApiGetGlobalEventLogOptions options)
+> GetEventLogResponse getGlobalEventLog(tenantId, urlId, userIdWS, startTime, endTime)
 
 
 
@@ -1182,7 +1182,7 @@ final startTime = 789; // int |
 final endTime = 789; // int | 
 
 try {
-    final result = api_instance.getGlobalEventLog(tenantId, urlId, userIdWS, startTime, ApiGetGlobalEventLogOptions(endTime: endTime));
+    final result = api_instance.getGlobalEventLog(tenantId, urlId, userIdWS, startTime, endTime);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGlobalEventLog: $e\n');
@@ -1413,7 +1413,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserNotificationCount**
-> GetUserNotificationCountResponse getUserNotificationCount(tenantId, ApiGetUserNotificationCountOptions options)
+> GetUserNotificationCountResponse getUserNotificationCount(tenantId, sso)
 
 
 
@@ -1426,7 +1426,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserNotificationCount(tenantId, ApiGetUserNotificationCountOptions(sso: sso));
+    final result = api_instance.getUserNotificationCount(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserNotificationCount: $e\n');
@@ -1785,7 +1785,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **lockComment**
-> APIEmptyResponse lockComment(tenantId, commentId, broadcastId, ApiLockCommentOptions options)
+> APIEmptyResponse lockComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -1800,7 +1800,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.lockComment(tenantId, commentId, broadcastId, ApiLockCommentOptions(sso: sso));
+    final result = api_instance.lockComment(tenantId, commentId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->lockComment: $e\n');
@@ -1869,7 +1869,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **pinComment**
-> ChangeCommentPinStatusResponse pinComment(tenantId, commentId, broadcastId, ApiPinCommentOptions options)
+> ChangeCommentPinStatusResponse pinComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -1884,7 +1884,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.pinComment(tenantId, commentId, broadcastId, ApiPinCommentOptions(sso: sso));
+    final result = api_instance.pinComment(tenantId, commentId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->pinComment: $e\n');
@@ -1967,7 +1967,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **resetUserNotificationCount**
-> ResetUserNotificationsResponse resetUserNotificationCount(tenantId, ApiResetUserNotificationCountOptions options)
+> ResetUserNotificationsResponse resetUserNotificationCount(tenantId, sso)
 
 
 
@@ -1980,7 +1980,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.resetUserNotificationCount(tenantId, ApiResetUserNotificationCountOptions(sso: sso));
+    final result = api_instance.resetUserNotificationCount(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->resetUserNotificationCount: $e\n');
@@ -2165,7 +2165,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unBlockCommentPublic**
-> UnblockSuccess unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiUnBlockCommentPublicOptions options)
+> UnblockSuccess unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso)
 
 
 
@@ -2180,7 +2180,7 @@ final publicBlockFromCommentParams = PublicBlockFromCommentParams(); // PublicBl
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, ApiUnBlockCommentPublicOptions(sso: sso));
+    final result = api_instance.unBlockCommentPublic(tenantId, commentId, publicBlockFromCommentParams, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unBlockCommentPublic: $e\n');
@@ -2212,7 +2212,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unLockComment**
-> APIEmptyResponse unLockComment(tenantId, commentId, broadcastId, ApiUnLockCommentOptions options)
+> APIEmptyResponse unLockComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -2227,7 +2227,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unLockComment(tenantId, commentId, broadcastId, ApiUnLockCommentOptions(sso: sso));
+    final result = api_instance.unLockComment(tenantId, commentId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unLockComment: $e\n');
@@ -2259,7 +2259,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unPinComment**
-> ChangeCommentPinStatusResponse unPinComment(tenantId, commentId, broadcastId, ApiUnPinCommentOptions options)
+> ChangeCommentPinStatusResponse unPinComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -2274,7 +2274,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.unPinComment(tenantId, commentId, broadcastId, ApiUnPinCommentOptions(sso: sso));
+    final result = api_instance.unPinComment(tenantId, commentId, broadcastId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->unPinComment: $e\n');
@@ -2355,7 +2355,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationCommentSubscriptionStatus**
-> UpdateUserNotificationCommentSubscriptionStatusResponse updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, ApiUpdateUserNotificationCommentSubscriptionStatusOptions options)
+> UpdateUserNotificationCommentSubscriptionStatusResponse updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, sso)
 
 
 
@@ -2373,7 +2373,7 @@ final commentId = commentId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, ApiUpdateUserNotificationCommentSubscriptionStatusOptions(sso: sso));
+    final result = api_instance.updateUserNotificationCommentSubscriptionStatus(tenantId, notificationId, optedInOrOut, commentId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationCommentSubscriptionStatus: $e\n');
@@ -2406,7 +2406,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationPageSubscriptionStatus**
-> UpdateUserNotificationPageSubscriptionStatusResponse updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, ApiUpdateUserNotificationPageSubscriptionStatusOptions options)
+> UpdateUserNotificationPageSubscriptionStatusResponse updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso)
 
 
 
@@ -2425,7 +2425,7 @@ final subscribedOrUnsubscribed = subscribedOrUnsubscribed_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, ApiUpdateUserNotificationPageSubscriptionStatusOptions(sso: sso));
+    final result = api_instance.updateUserNotificationPageSubscriptionStatus(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationPageSubscriptionStatus: $e\n');
@@ -2459,7 +2459,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserNotificationStatus**
-> UpdateUserNotificationStatusResponse updateUserNotificationStatus(tenantId, notificationId, newStatus, ApiUpdateUserNotificationStatusOptions options)
+> UpdateUserNotificationStatusResponse updateUserNotificationStatus(tenantId, notificationId, newStatus, sso)
 
 
 
@@ -2474,7 +2474,7 @@ final newStatus = newStatus_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateUserNotificationStatus(tenantId, notificationId, newStatus, ApiUpdateUserNotificationStatusOptions(sso: sso));
+    final result = api_instance.updateUserNotificationStatus(tenantId, notificationId, newStatus, sso);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateUserNotificationStatus: $e\n');
diff --git a/client/lib/api/default_api.dart b/client/lib/api/default_api.dart
index 526db0f..877c688 100644
--- a/client/lib/api/default_api.dart
+++ b/client/lib/api/default_api.dart
@@ -75,8 +75,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<Response> addHashTagWithHttpInfo(CreateHashTagBody createHashTagBody, [ ApiAddHashTagOptions? options, ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> addHashTagWithHttpInfo(CreateHashTagBody createHashTagBody, [ String? tenantId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -110,8 +109,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<CreateHashTagResponse?> addHashTag(CreateHashTagBody createHashTagBody, [ ApiAddHashTagOptions? options, ]) async {
-    final response = await addHashTagWithHttpInfo(createHashTagBody, options,);
+  Future<CreateHashTagResponse?> addHashTag(CreateHashTagBody createHashTagBody, [ String? tenantId, ]) async {
+    final response = await addHashTagWithHttpInfo(createHashTagBody, tenantId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -131,8 +130,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<Response> addHashTagsBulkWithHttpInfo(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ ApiAddHashTagsBulkOptions? options, ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> addHashTagsBulkWithHttpInfo(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/bulk';
 
@@ -166,8 +164,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ ApiAddHashTagsBulkOptions? options, ]) async {
-    final response = await addHashTagsBulkWithHttpInfo(bulkCreateHashTagsBody, options,);
+  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId, ]) async {
+    final response = await addHashTagsBulkWithHttpInfo(bulkCreateHashTagsBody, tenantId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -540,8 +538,7 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ ApiBulkAggregateQuestionResultsOptions? options, ]) async {
-    final forceRecalculate = options?.forceRecalculate;
+  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ bool? forceRecalculate, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation/bulk';
 
@@ -578,8 +575,8 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ ApiBulkAggregateQuestionResultsOptions? options, ]) async {
-    final response = await bulkAggregateQuestionResultsWithHttpInfo(tenantId, bulkAggregateQuestionResultsRequest, options,);
+  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ bool? forceRecalculate, ]) async {
+    final response = await bulkAggregateQuestionResultsWithHttpInfo(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1709,8 +1706,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<Response> deleteHashTagWithHttpInfo(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ ApiDeleteHashTagOptions? options, ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> deleteHashTagWithHttpInfo(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -1747,8 +1743,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<APIEmptyResponse?> deleteHashTag(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ ApiDeleteHashTagOptions? options, ]) async {
-    final response = await deleteHashTagWithHttpInfo(tag, deleteHashTagRequestBody, options,);
+  Future<APIEmptyResponse?> deleteHashTag(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId, ]) async {
+    final response = await deleteHashTagWithHttpInfo(tag, deleteHashTagRequestBody, tenantId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1770,8 +1766,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<Response> deleteModeratorWithHttpInfo(String tenantId, String id, [ ApiDeleteModeratorOptions? options, ]) async {
-    final sendEmail = options?.sendEmail;
+  Future<Response> deleteModeratorWithHttpInfo(String tenantId, String id, [ String? sendEmail, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -1809,8 +1804,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<APIEmptyResponse?> deleteModerator(String tenantId, String id, [ ApiDeleteModeratorOptions? options, ]) async {
-    final response = await deleteModeratorWithHttpInfo(tenantId, id, options,);
+  Future<APIEmptyResponse?> deleteModerator(String tenantId, String id, [ String? sendEmail, ]) async {
+    final response = await deleteModeratorWithHttpInfo(tenantId, id, sendEmail,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2172,8 +2167,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> deleteSubscriptionWithHttpInfo(String tenantId, String id, [ ApiDeleteSubscriptionOptions? options, ]) async {
-    final userId = options?.userId;
+  Future<Response> deleteSubscriptionWithHttpInfo(String tenantId, String id, [ String? userId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -2211,8 +2205,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(String tenantId, String id, [ ApiDeleteSubscriptionOptions? options, ]) async {
-    final response = await deleteSubscriptionWithHttpInfo(tenantId, id, options,);
+  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(String tenantId, String id, [ String? userId, ]) async {
+    final response = await deleteSubscriptionWithHttpInfo(tenantId, id, userId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2234,8 +2228,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<Response> deleteTenantWithHttpInfo(String tenantId, String id, [ ApiDeleteTenantOptions? options, ]) async {
-    final sure = options?.sure;
+  Future<Response> deleteTenantWithHttpInfo(String tenantId, String id, [ String? sure, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -2273,8 +2266,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<APIEmptyResponse?> deleteTenant(String tenantId, String id, [ ApiDeleteTenantOptions? options, ]) async {
-    final response = await deleteTenantWithHttpInfo(tenantId, id, options,);
+  Future<APIEmptyResponse?> deleteTenant(String tenantId, String id, [ String? sure, ]) async {
+    final response = await deleteTenantWithHttpInfo(tenantId, id, sure,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2474,8 +2467,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<Response> deleteVoteWithHttpInfo(String tenantId, String id, [ ApiDeleteVoteOptions? options, ]) async {
-    final editKey = options?.editKey;
+  Future<Response> deleteVoteWithHttpInfo(String tenantId, String id, [ String? editKey, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes/{id}'
       .replaceAll('{id}', id);
@@ -2513,8 +2505,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<VoteDeleteResponse?> deleteVote(String tenantId, String id, [ ApiDeleteVoteOptions? options, ]) async {
-    final response = await deleteVoteWithHttpInfo(tenantId, id, options,);
+  Future<VoteDeleteResponse?> deleteVote(String tenantId, String id, [ String? editKey, ]) async {
+    final response = await deleteVoteWithHttpInfo(tenantId, id, editKey,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3186,8 +3178,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(String tenantId, String id, [ ApiGetEmailTemplateRenderErrorsOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(String tenantId, String id, [ double? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors'
       .replaceAll('{id}', id);
@@ -3225,8 +3216,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(String tenantId, String id, [ ApiGetEmailTemplateRenderErrorsOptions? options, ]) async {
-    final response = await getEmailTemplateRenderErrorsWithHttpInfo(tenantId, id, options,);
+  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(String tenantId, String id, [ double? skip, ]) async {
+    final response = await getEmailTemplateRenderErrorsWithHttpInfo(tenantId, id, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3246,8 +3237,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplatesWithHttpInfo(String tenantId, [ ApiGetEmailTemplatesOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getEmailTemplatesWithHttpInfo(String tenantId, [ double? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -3282,8 +3272,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplatesResponse?> getEmailTemplates(String tenantId, [ ApiGetEmailTemplatesOptions? options, ]) async {
-    final response = await getEmailTemplatesWithHttpInfo(tenantId, options,);
+  Future<GetEmailTemplatesResponse?> getEmailTemplates(String tenantId, [ double? skip, ]) async {
+    final response = await getEmailTemplatesWithHttpInfo(tenantId, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3381,8 +3371,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<Response> getHashTagsWithHttpInfo(String tenantId, [ ApiGetHashTagsOptions? options, ]) async {
-    final page = options?.page;
+  Future<Response> getHashTagsWithHttpInfo(String tenantId, [ double? page, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -3417,8 +3406,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<GetHashTagsResponse?> getHashTags(String tenantId, [ ApiGetHashTagsOptions? options, ]) async {
-    final response = await getHashTagsWithHttpInfo(tenantId, options,);
+  Future<GetHashTagsResponse?> getHashTags(String tenantId, [ double? page, ]) async {
+    final response = await getHashTagsWithHttpInfo(tenantId, page,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3492,8 +3481,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getModeratorsWithHttpInfo(String tenantId, [ ApiGetModeratorsOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getModeratorsWithHttpInfo(String tenantId, [ double? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -3528,8 +3516,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetModeratorsResponse?> getModerators(String tenantId, [ ApiGetModeratorsOptions? options, ]) async {
-    final response = await getModeratorsWithHttpInfo(tenantId, options,);
+  Future<GetModeratorsResponse?> getModerators(String tenantId, [ double? skip, ]) async {
+    final response = await getModeratorsWithHttpInfo(tenantId, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4094,8 +4082,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getQuestionConfigsWithHttpInfo(String tenantId, [ ApiGetQuestionConfigsOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getQuestionConfigsWithHttpInfo(String tenantId, [ double? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -4130,8 +4117,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetQuestionConfigsResponse?> getQuestionConfigs(String tenantId, [ ApiGetQuestionConfigsOptions? options, ]) async {
-    final response = await getQuestionConfigsWithHttpInfo(tenantId, options,);
+  Future<GetQuestionConfigsResponse?> getQuestionConfigs(String tenantId, [ double? skip, ]) async {
+    final response = await getQuestionConfigsWithHttpInfo(tenantId, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4410,8 +4397,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<Response> getSSOUsersWithHttpInfo(String tenantId, [ ApiGetSSOUsersOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getSSOUsersWithHttpInfo(String tenantId, [ int? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -4446,8 +4432,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<GetSSOUsersResponse?> getSSOUsers(String tenantId, [ ApiGetSSOUsersOptions? options, ]) async {
-    final response = await getSSOUsersWithHttpInfo(tenantId, options,);
+  Future<GetSSOUsersResponse?> getSSOUsers(String tenantId, [ int? skip, ]) async {
+    final response = await getSSOUsersWithHttpInfo(tenantId, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4467,8 +4453,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<Response> getSubscriptionsWithHttpInfo(String tenantId, [ ApiGetSubscriptionsOptions? options, ]) async {
-    final userId = options?.userId;
+  Future<Response> getSubscriptionsWithHttpInfo(String tenantId, [ String? userId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -4503,8 +4488,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<GetSubscriptionsAPIResponse?> getSubscriptions(String tenantId, [ ApiGetSubscriptionsOptions? options, ]) async {
-    final response = await getSubscriptionsWithHttpInfo(tenantId, options,);
+  Future<GetSubscriptionsAPIResponse?> getSubscriptions(String tenantId, [ String? userId, ]) async {
+    final response = await getSubscriptionsWithHttpInfo(tenantId, userId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4713,8 +4698,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantPackagesWithHttpInfo(String tenantId, [ ApiGetTenantPackagesOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getTenantPackagesWithHttpInfo(String tenantId, [ double? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -4749,8 +4733,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantPackagesResponse?> getTenantPackages(String tenantId, [ ApiGetTenantPackagesOptions? options, ]) async {
-    final response = await getTenantPackagesWithHttpInfo(tenantId, options,);
+  Future<GetTenantPackagesResponse?> getTenantPackages(String tenantId, [ double? skip, ]) async {
+    final response = await getTenantPackagesWithHttpInfo(tenantId, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4824,8 +4808,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantUsersWithHttpInfo(String tenantId, [ ApiGetTenantUsersOptions? options, ]) async {
-    final skip = options?.skip;
+  Future<Response> getTenantUsersWithHttpInfo(String tenantId, [ double? skip, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -4860,8 +4843,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantUsersResponse?> getTenantUsers(String tenantId, [ ApiGetTenantUsersOptions? options, ]) async {
-    final response = await getTenantUsersWithHttpInfo(tenantId, options,);
+  Future<GetTenantUsersResponse?> getTenantUsers(String tenantId, [ double? skip, ]) async {
+    final response = await getTenantUsersWithHttpInfo(tenantId, skip,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4948,8 +4931,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> getTicketWithHttpInfo(String tenantId, String id, [ ApiGetTicketOptions? options, ]) async {
-    final userId = options?.userId;
+  Future<Response> getTicketWithHttpInfo(String tenantId, String id, [ String? userId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}'
       .replaceAll('{id}', id);
@@ -4987,8 +4969,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<GetTicketResponse?> getTicket(String tenantId, String id, [ ApiGetTicketOptions? options, ]) async {
-    final response = await getTicketWithHttpInfo(tenantId, id, options,);
+  Future<GetTicketResponse?> getTicket(String tenantId, String id, [ String? userId, ]) async {
+    final response = await getTicketWithHttpInfo(tenantId, id, userId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5659,8 +5641,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<Response> patchHashTagWithHttpInfo(String tag, UpdateHashTagBody updateHashTagBody, [ ApiPatchHashTagOptions? options, ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> patchHashTagWithHttpInfo(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -5697,8 +5678,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<UpdateHashTagResponse?> patchHashTag(String tag, UpdateHashTagBody updateHashTagBody, [ ApiPatchHashTagOptions? options, ]) async {
-    final response = await patchHashTagWithHttpInfo(tag, updateHashTagBody, options,);
+  Future<UpdateHashTagResponse?> patchHashTag(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId, ]) async {
+    final response = await patchHashTagWithHttpInfo(tag, updateHashTagBody, tenantId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5780,8 +5761,7 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> patchSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPatchSSOUserOptions? options, ]) async {
-    final updateComments = options?.updateComments;
+  Future<Response> patchSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5821,8 +5801,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PatchSSOUserAPIResponse?> patchSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPatchSSOUserOptions? options, ]) async {
-    final response = await patchSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, options,);
+  Future<PatchSSOUserAPIResponse?> patchSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
+    final response = await patchSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, updateComments,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5904,8 +5884,7 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> putSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPutSSOUserOptions? options, ]) async {
-    final updateComments = options?.updateComments;
+  Future<Response> putSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5945,8 +5924,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PutSSOUserAPIResponse?> putSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ ApiPutSSOUserOptions? options, ]) async {
-    final response = await putSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, options,);
+  Future<PutSSOUserAPIResponse?> putSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
+    final response = await putSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, updateComments,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5968,8 +5947,7 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<Response> renderEmailTemplateWithHttpInfo(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ ApiRenderEmailTemplateOptions? options, ]) async {
-    final locale = options?.locale;
+  Future<Response> renderEmailTemplateWithHttpInfo(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ String? locale, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/render';
 
@@ -6006,8 +5984,8 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<RenderEmailTemplateResponse?> renderEmailTemplate(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ ApiRenderEmailTemplateOptions? options, ]) async {
-    final response = await renderEmailTemplateWithHttpInfo(tenantId, renderEmailTemplateBody, options,);
+  Future<RenderEmailTemplateResponse?> renderEmailTemplate(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ String? locale, ]) async {
+    final response = await renderEmailTemplateWithHttpInfo(tenantId, renderEmailTemplateBody, locale,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6089,8 +6067,7 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> replaceTenantUserWithHttpInfo(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ ApiReplaceTenantUserOptions? options, ]) async {
-    final updateComments = options?.updateComments;
+  Future<Response> replaceTenantUserWithHttpInfo(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ String? updateComments, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -6130,8 +6107,8 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> replaceTenantUser(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ ApiReplaceTenantUserOptions? options, ]) async {
-    final response = await replaceTenantUserWithHttpInfo(tenantId, id, replaceTenantUserBody, options,);
+  Future<APIEmptyResponse?> replaceTenantUser(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ String? updateComments, ]) async {
+    final response = await replaceTenantUserWithHttpInfo(tenantId, id, replaceTenantUserBody, updateComments,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6385,8 +6362,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<Response> sendLoginLinkWithHttpInfo(String tenantId, String id, [ ApiSendLoginLinkOptions? options, ]) async {
-    final redirectURL = options?.redirectURL;
+  Future<Response> sendLoginLinkWithHttpInfo(String tenantId, String id, [ String? redirectURL, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}/send-login-link'
       .replaceAll('{id}', id);
@@ -6424,8 +6400,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<APIEmptyResponse?> sendLoginLink(String tenantId, String id, [ ApiSendLoginLinkOptions? options, ]) async {
-    final response = await sendLoginLinkWithHttpInfo(tenantId, id, options,);
+  Future<APIEmptyResponse?> sendLoginLink(String tenantId, String id, [ String? redirectURL, ]) async {
+    final response = await sendLoginLinkWithHttpInfo(tenantId, id, redirectURL,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6849,8 +6825,7 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<Response> updateNotificationWithHttpInfo(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ ApiUpdateNotificationOptions? options, ]) async {
-    final userId = options?.userId;
+  Future<Response> updateNotificationWithHttpInfo(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ String? userId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications/{id}'
       .replaceAll('{id}', id);
@@ -6890,8 +6865,8 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<APIEmptyResponse?> updateNotification(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ ApiUpdateNotificationOptions? options, ]) async {
-    final response = await updateNotificationWithHttpInfo(tenantId, id, updateNotificationBody, options,);
+  Future<APIEmptyResponse?> updateNotification(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ String? userId, ]) async {
+    final response = await updateNotificationWithHttpInfo(tenantId, id, updateNotificationBody, userId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7031,8 +7006,7 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<Response> updateSubscriptionWithHttpInfo(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ ApiUpdateSubscriptionOptions? options, ]) async {
-    final userId = options?.userId;
+  Future<Response> updateSubscriptionWithHttpInfo(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ String? userId, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -7072,8 +7046,8 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<UpdateSubscriptionAPIResponse?> updateSubscription(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ ApiUpdateSubscriptionOptions? options, ]) async {
-    final response = await updateSubscriptionWithHttpInfo(tenantId, id, updateAPIUserSubscriptionData, options,);
+  Future<UpdateSubscriptionAPIResponse?> updateSubscription(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ String? userId, ]) async {
+    final response = await updateSubscriptionWithHttpInfo(tenantId, id, updateAPIUserSubscriptionData, userId,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7213,8 +7187,7 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> updateTenantUserWithHttpInfo(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ ApiUpdateTenantUserOptions? options, ]) async {
-    final updateComments = options?.updateComments;
+  Future<Response> updateTenantUserWithHttpInfo(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ String? updateComments, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -7254,8 +7227,8 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> updateTenantUser(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ ApiUpdateTenantUserOptions? options, ]) async {
-    final response = await updateTenantUserWithHttpInfo(tenantId, id, updateTenantUserBody, options,);
+  Future<APIEmptyResponse?> updateTenantUser(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ String? updateComments, ]) async {
+    final response = await updateTenantUserWithHttpInfo(tenantId, id, updateTenantUserBody, updateComments,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7328,22 +7301,6 @@ class DefaultApi {
   }
 }
 
-/// Optional parameters for [DefaultApi.addHashTag].
-class ApiAddHashTagOptions {
-  const ApiAddHashTagOptions({
-    this.tenantId,
-  });
-  final String? tenantId;
-}
-
-/// Optional parameters for [DefaultApi.addHashTagsBulk].
-class ApiAddHashTagsBulkOptions {
-  const ApiAddHashTagsBulkOptions({
-    this.tenantId,
-  });
-  final String? tenantId;
-}
-
 /// Optional parameters for [DefaultApi.aggregate].
 class ApiAggregateOptions {
   const ApiAggregateOptions({
@@ -7382,14 +7339,6 @@ class ApiBlockUserFromCommentOptions {
   final String? anonUserId;
 }
 
-/// Optional parameters for [DefaultApi.bulkAggregateQuestionResults].
-class ApiBulkAggregateQuestionResultsOptions {
-  const ApiBulkAggregateQuestionResultsOptions({
-    this.forceRecalculate,
-  });
-  final bool? forceRecalculate;
-}
-
 /// Optional parameters for [DefaultApi.combineCommentsWithQuestionResults].
 class ApiCombineCommentsWithQuestionResultsOptions {
   const ApiCombineCommentsWithQuestionResultsOptions({
@@ -7446,22 +7395,6 @@ class ApiDeleteCommentOptions {
   final bool? isLive;
 }
 
-/// Optional parameters for [DefaultApi.deleteHashTag].
-class ApiDeleteHashTagOptions {
-  const ApiDeleteHashTagOptions({
-    this.tenantId,
-  });
-  final String? tenantId;
-}
-
-/// Optional parameters for [DefaultApi.deleteModerator].
-class ApiDeleteModeratorOptions {
-  const ApiDeleteModeratorOptions({
-    this.sendEmail,
-  });
-  final String? sendEmail;
-}
-
 /// Optional parameters for [DefaultApi.deleteSSOUser].
 class ApiDeleteSSOUserOptions {
   const ApiDeleteSSOUserOptions({
@@ -7472,22 +7405,6 @@ class ApiDeleteSSOUserOptions {
   final String? commentDeleteMode;
 }
 
-/// Optional parameters for [DefaultApi.deleteSubscription].
-class ApiDeleteSubscriptionOptions {
-  const ApiDeleteSubscriptionOptions({
-    this.userId,
-  });
-  final String? userId;
-}
-
-/// Optional parameters for [DefaultApi.deleteTenant].
-class ApiDeleteTenantOptions {
-  const ApiDeleteTenantOptions({
-    this.sure,
-  });
-  final String? sure;
-}
-
 /// Optional parameters for [DefaultApi.deleteTenantUser].
 class ApiDeleteTenantUserOptions {
   const ApiDeleteTenantUserOptions({
@@ -7498,14 +7415,6 @@ class ApiDeleteTenantUserOptions {
   final String? commentDeleteMode;
 }
 
-/// Optional parameters for [DefaultApi.deleteVote].
-class ApiDeleteVoteOptions {
-  const ApiDeleteVoteOptions({
-    this.editKey,
-  });
-  final String? editKey;
-}
-
 /// Optional parameters for [DefaultApi.flagComment].
 class ApiFlagCommentOptions {
   const ApiFlagCommentOptions({
@@ -7570,22 +7479,6 @@ class ApiGetCommentsOptions {
   final int? toDate;
 }
 
-/// Optional parameters for [DefaultApi.getEmailTemplateRenderErrors].
-class ApiGetEmailTemplateRenderErrorsOptions {
-  const ApiGetEmailTemplateRenderErrorsOptions({
-    this.skip,
-  });
-  final double? skip;
-}
-
-/// Optional parameters for [DefaultApi.getEmailTemplates].
-class ApiGetEmailTemplatesOptions {
-  const ApiGetEmailTemplatesOptions({
-    this.skip,
-  });
-  final double? skip;
-}
-
 /// Optional parameters for [DefaultApi.getFeedPosts].
 class ApiGetFeedPostsOptions {
   const ApiGetFeedPostsOptions({
@@ -7598,22 +7491,6 @@ class ApiGetFeedPostsOptions {
   final List<String>? tags;
 }
 
-/// Optional parameters for [DefaultApi.getHashTags].
-class ApiGetHashTagsOptions {
-  const ApiGetHashTagsOptions({
-    this.page,
-  });
-  final double? page;
-}
-
-/// Optional parameters for [DefaultApi.getModerators].
-class ApiGetModeratorsOptions {
-  const ApiGetModeratorsOptions({
-    this.skip,
-  });
-  final double? skip;
-}
-
 /// Optional parameters for [DefaultApi.getNotificationCount].
 class ApiGetNotificationCountOptions {
   const ApiGetNotificationCountOptions({
@@ -7686,14 +7563,6 @@ class ApiGetPendingWebhookEventsOptions {
   final double? skip;
 }
 
-/// Optional parameters for [DefaultApi.getQuestionConfigs].
-class ApiGetQuestionConfigsOptions {
-  const ApiGetQuestionConfigsOptions({
-    this.skip,
-  });
-  final double? skip;
-}
-
 /// Optional parameters for [DefaultApi.getQuestionResults].
 class ApiGetQuestionResultsOptions {
   const ApiGetQuestionResultsOptions({
@@ -7712,22 +7581,6 @@ class ApiGetQuestionResultsOptions {
   final double? skip;
 }
 
-/// Optional parameters for [DefaultApi.getSSOUsers].
-class ApiGetSSOUsersOptions {
-  const ApiGetSSOUsersOptions({
-    this.skip,
-  });
-  final int? skip;
-}
-
-/// Optional parameters for [DefaultApi.getSubscriptions].
-class ApiGetSubscriptionsOptions {
-  const ApiGetSubscriptionsOptions({
-    this.userId,
-  });
-  final String? userId;
-}
-
 /// Optional parameters for [DefaultApi.getTenantDailyUsages].
 class ApiGetTenantDailyUsagesOptions {
   const ApiGetTenantDailyUsagesOptions({
@@ -7742,22 +7595,6 @@ class ApiGetTenantDailyUsagesOptions {
   final double? skip;
 }
 
-/// Optional parameters for [DefaultApi.getTenantPackages].
-class ApiGetTenantPackagesOptions {
-  const ApiGetTenantPackagesOptions({
-    this.skip,
-  });
-  final double? skip;
-}
-
-/// Optional parameters for [DefaultApi.getTenantUsers].
-class ApiGetTenantUsersOptions {
-  const ApiGetTenantUsersOptions({
-    this.skip,
-  });
-  final double? skip;
-}
-
 /// Optional parameters for [DefaultApi.getTenants].
 class ApiGetTenantsOptions {
   const ApiGetTenantsOptions({
@@ -7768,14 +7605,6 @@ class ApiGetTenantsOptions {
   final double? skip;
 }
 
-/// Optional parameters for [DefaultApi.getTicket].
-class ApiGetTicketOptions {
-  const ApiGetTicketOptions({
-    this.userId,
-  });
-  final String? userId;
-}
-
 /// Optional parameters for [DefaultApi.getTickets].
 class ApiGetTicketsOptions {
   const ApiGetTicketsOptions({
@@ -7830,46 +7659,6 @@ class ApiGetVotesForUserOptions {
   final String? anonUserId;
 }
 
-/// Optional parameters for [DefaultApi.patchHashTag].
-class ApiPatchHashTagOptions {
-  const ApiPatchHashTagOptions({
-    this.tenantId,
-  });
-  final String? tenantId;
-}
-
-/// Optional parameters for [DefaultApi.patchSSOUser].
-class ApiPatchSSOUserOptions {
-  const ApiPatchSSOUserOptions({
-    this.updateComments,
-  });
-  final bool? updateComments;
-}
-
-/// Optional parameters for [DefaultApi.putSSOUser].
-class ApiPutSSOUserOptions {
-  const ApiPutSSOUserOptions({
-    this.updateComments,
-  });
-  final bool? updateComments;
-}
-
-/// Optional parameters for [DefaultApi.renderEmailTemplate].
-class ApiRenderEmailTemplateOptions {
-  const ApiRenderEmailTemplateOptions({
-    this.locale,
-  });
-  final String? locale;
-}
-
-/// Optional parameters for [DefaultApi.replaceTenantUser].
-class ApiReplaceTenantUserOptions {
-  const ApiReplaceTenantUserOptions({
-    this.updateComments,
-  });
-  final String? updateComments;
-}
-
 /// Optional parameters for [DefaultApi.saveComment].
 class ApiSaveCommentOptions {
   const ApiSaveCommentOptions({
@@ -7898,14 +7687,6 @@ class ApiSaveCommentsBulkOptions {
   final bool? populateNotifications;
 }
 
-/// Optional parameters for [DefaultApi.sendLoginLink].
-class ApiSendLoginLinkOptions {
-  const ApiSendLoginLinkOptions({
-    this.redirectURL,
-  });
-  final String? redirectURL;
-}
-
 /// Optional parameters for [DefaultApi.unBlockUserFromComment].
 class ApiUnBlockUserFromCommentOptions {
   const ApiUnBlockUserFromCommentOptions({
@@ -7937,27 +7718,3 @@ class ApiUpdateCommentOptions {
   final bool? doSpamCheck;
   final bool? isLive;
 }
-
-/// Optional parameters for [DefaultApi.updateNotification].
-class ApiUpdateNotificationOptions {
-  const ApiUpdateNotificationOptions({
-    this.userId,
-  });
-  final String? userId;
-}
-
-/// Optional parameters for [DefaultApi.updateSubscription].
-class ApiUpdateSubscriptionOptions {
-  const ApiUpdateSubscriptionOptions({
-    this.userId,
-  });
-  final String? userId;
-}
-
-/// Optional parameters for [DefaultApi.updateTenantUser].
-class ApiUpdateTenantUserOptions {
-  const ApiUpdateTenantUserOptions({
-    this.updateComments,
-  });
-  final String? updateComments;
-}
diff --git a/client/lib/api/public_api.dart b/client/lib/api/public_api.dart
index c3ae689..ada0bf0 100644
--- a/client/lib/api/public_api.dart
+++ b/client/lib/api/public_api.dart
@@ -26,8 +26,7 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> blockFromCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiBlockFromCommentPublicOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> blockFromCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -67,8 +66,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<BlockSuccess?> blockFromCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiBlockFromCommentPublicOptions? options, ]) async {
-    final response = await blockFromCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, options,);
+  Future<BlockSuccess?> blockFromCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
+    final response = await blockFromCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -91,8 +90,7 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<Response> checkedCommentsForBlockedWithHttpInfo(String tenantId, String commentIds, [ ApiCheckedCommentsForBlockedOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> checkedCommentsForBlockedWithHttpInfo(String tenantId, String commentIds, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/check-blocked-comments';
 
@@ -131,8 +129,8 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(String tenantId, String commentIds, [ ApiCheckedCommentsForBlockedOptions? options, ]) async {
-    final response = await checkedCommentsForBlockedWithHttpInfo(tenantId, commentIds, options,);
+  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(String tenantId, String commentIds, [ String? sso, ]) async {
+    final response = await checkedCommentsForBlockedWithHttpInfo(tenantId, commentIds, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -302,8 +300,7 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<Response> createV1PageReactWithHttpInfo(String tenantId, String urlId, [ ApiCreateV1PageReactOptions? options, ]) async {
-    final title = options?.title;
+  Future<Response> createV1PageReactWithHttpInfo(String tenantId, String urlId, [ String? title, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -341,8 +338,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV1PageReact(String tenantId, String urlId, [ ApiCreateV1PageReactOptions? options, ]) async {
-    final response = await createV1PageReactWithHttpInfo(tenantId, urlId, options,);
+  Future<CreateV1PageReact?> createV1PageReact(String tenantId, String urlId, [ String? title, ]) async {
+    final response = await createV1PageReactWithHttpInfo(tenantId, urlId, title,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -366,8 +363,7 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<Response> createV2PageReactWithHttpInfo(String tenantId, String urlId, String id, [ ApiCreateV2PageReactOptions? options, ]) async {
-    final title = options?.title;
+  Future<Response> createV2PageReactWithHttpInfo(String tenantId, String urlId, String id, [ String? title, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -408,8 +404,8 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV2PageReact(String tenantId, String urlId, String id, [ ApiCreateV2PageReactOptions? options, ]) async {
-    final response = await createV2PageReactWithHttpInfo(tenantId, urlId, id, options,);
+  Future<CreateV1PageReact?> createV2PageReact(String tenantId, String urlId, String id, [ String? title, ]) async {
+    final response = await createV2PageReactWithHttpInfo(tenantId, urlId, id, title,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -776,8 +772,7 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<Response> flagCommentPublicWithHttpInfo(String tenantId, String commentId, bool isFlagged, [ ApiFlagCommentPublicOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> flagCommentPublicWithHttpInfo(String tenantId, String commentId, bool isFlagged, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -818,8 +813,8 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> flagCommentPublic(String tenantId, String commentId, bool isFlagged, [ ApiFlagCommentPublicOptions? options, ]) async {
-    final response = await flagCommentPublicWithHttpInfo(tenantId, commentId, isFlagged, options,);
+  Future<APIEmptyResponse?> flagCommentPublic(String tenantId, String commentId, bool isFlagged, [ String? sso, ]) async {
+    final response = await flagCommentPublicWithHttpInfo(tenantId, commentId, isFlagged, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -913,8 +908,7 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<Response> getCommentVoteUserNamesWithHttpInfo(String tenantId, String commentId, int dir, [ ApiGetCommentVoteUserNamesOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> getCommentVoteUserNamesWithHttpInfo(String tenantId, String commentId, int dir, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/votes'
       .replaceAll('{tenantId}', tenantId)
@@ -955,8 +949,8 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(String tenantId, String commentId, int dir, [ ApiGetCommentVoteUserNamesOptions? options, ]) async {
-    final response = await getCommentVoteUserNamesWithHttpInfo(tenantId, commentId, dir, options,);
+  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(String tenantId, String commentId, int dir, [ String? sso, ]) async {
+    final response = await getCommentVoteUserNamesWithHttpInfo(tenantId, commentId, dir, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1352,8 +1346,7 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetEventLogOptions? options, ]) async {
-    final endTime = options?.endTime;
+  Future<Response> getEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/event-log/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1399,8 +1392,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetEventLogOptions? options, ]) async {
-    final response = await getEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, options,);
+  Future<GetEventLogResponse?> getEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
+    final response = await getEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, endTime,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1524,8 +1517,7 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<Response> getFeedPostsStatsWithHttpInfo(String tenantId, List<String> postIds, [ ApiGetFeedPostsStatsOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> getFeedPostsStatsWithHttpInfo(String tenantId, List<String> postIds, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/stats'
       .replaceAll('{tenantId}', tenantId);
@@ -1563,8 +1555,8 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<FeedPostsStatsResponse?> getFeedPostsStats(String tenantId, List<String> postIds, [ ApiGetFeedPostsStatsOptions? options, ]) async {
-    final response = await getFeedPostsStatsWithHttpInfo(tenantId, postIds, options,);
+  Future<FeedPostsStatsResponse?> getFeedPostsStats(String tenantId, List<String> postIds, [ String? sso, ]) async {
+    final response = await getFeedPostsStatsWithHttpInfo(tenantId, postIds, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1798,8 +1790,7 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getGlobalEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetGlobalEventLogOptions? options, ]) async {
-    final endTime = options?.endTime;
+  Future<Response> getGlobalEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/event-log/global/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1845,8 +1836,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getGlobalEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ ApiGetGlobalEventLogOptions? options, ]) async {
-    final response = await getGlobalEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, options,);
+  Future<GetEventLogResponse?> getGlobalEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
+    final response = await getGlobalEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, endTime,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2202,8 +2193,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationCountWithHttpInfo(String tenantId, [ ApiGetUserNotificationCountOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> getUserNotificationCountWithHttpInfo(String tenantId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/get-count';
 
@@ -2238,8 +2228,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<GetUserNotificationCountResponse?> getUserNotificationCount(String tenantId, [ ApiGetUserNotificationCountOptions? options, ]) async {
-    final response = await getUserNotificationCountWithHttpInfo(tenantId, options,);
+  Future<GetUserNotificationCountResponse?> getUserNotificationCount(String tenantId, [ String? sso, ]) async {
+    final response = await getUserNotificationCountWithHttpInfo(tenantId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2754,8 +2744,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> lockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiLockCommentOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> lockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/lock'
       .replaceAll('{tenantId}', tenantId)
@@ -2796,8 +2785,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> lockComment(String tenantId, String commentId, String broadcastId, [ ApiLockCommentOptions? options, ]) async {
-    final response = await lockCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
+  Future<APIEmptyResponse?> lockComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+    final response = await lockCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2862,8 +2851,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> pinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiPinCommentOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> pinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/pin'
       .replaceAll('{tenantId}', tenantId)
@@ -2904,8 +2892,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> pinComment(String tenantId, String commentId, String broadcastId, [ ApiPinCommentOptions? options, ]) async {
-    final response = await pinCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
+  Future<ChangeCommentPinStatusResponse?> pinComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+    final response = await pinCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3007,8 +2995,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationCountWithHttpInfo(String tenantId, [ ApiResetUserNotificationCountOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> resetUserNotificationCountWithHttpInfo(String tenantId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/reset-count';
 
@@ -3043,8 +3030,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(String tenantId, [ ApiResetUserNotificationCountOptions? options, ]) async {
-    final response = await resetUserNotificationCountWithHttpInfo(tenantId, options,);
+  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(String tenantId, [ String? sso, ]) async {
+    final response = await resetUserNotificationCountWithHttpInfo(tenantId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3330,8 +3317,7 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> unBlockCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiUnBlockCommentPublicOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> unBlockCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -3371,8 +3357,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<UnblockSuccess?> unBlockCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ ApiUnBlockCommentPublicOptions? options, ]) async {
-    final response = await unBlockCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, options,);
+  Future<UnblockSuccess?> unBlockCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
+    final response = await unBlockCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3396,8 +3382,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unLockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiUnLockCommentOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> unLockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unlock'
       .replaceAll('{tenantId}', tenantId)
@@ -3438,8 +3423,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> unLockComment(String tenantId, String commentId, String broadcastId, [ ApiUnLockCommentOptions? options, ]) async {
-    final response = await unLockCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
+  Future<APIEmptyResponse?> unLockComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+    final response = await unLockCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3463,8 +3448,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unPinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiUnPinCommentOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> unPinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unpin'
       .replaceAll('{tenantId}', tenantId)
@@ -3505,8 +3489,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> unPinComment(String tenantId, String commentId, String broadcastId, [ ApiUnPinCommentOptions? options, ]) async {
-    final response = await unPinCommentWithHttpInfo(tenantId, commentId, broadcastId, options,);
+  Future<ChangeCommentPinStatusResponse?> unPinComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+    final response = await unPinCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3609,8 +3593,7 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(String tenantId, String notificationId, String optedInOrOut, String commentId, [ ApiUpdateUserNotificationCommentSubscriptionStatusOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(String tenantId, String notificationId, String optedInOrOut, String commentId, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark-opted/{optedInOrOut}'
       .replaceAll('{notificationId}', notificationId)
@@ -3656,8 +3639,8 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(String tenantId, String notificationId, String optedInOrOut, String commentId, [ ApiUpdateUserNotificationCommentSubscriptionStatusOptions? options, ]) async {
-    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(tenantId, notificationId, optedInOrOut, commentId, options,);
+  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(String tenantId, String notificationId, String optedInOrOut, String commentId, [ String? sso, ]) async {
+    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(tenantId, notificationId, optedInOrOut, commentId, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3688,8 +3671,7 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ ApiUpdateUserNotificationPageSubscriptionStatusOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/set-subscription-state/{subscribedOrUnsubscribed}'
       .replaceAll('{subscribedOrUnsubscribed}', subscribedOrUnsubscribed);
@@ -3738,8 +3720,8 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ ApiUpdateUserNotificationPageSubscriptionStatusOptions? options, ]) async {
-    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, options,);
+  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ String? sso, ]) async {
+    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3763,8 +3745,7 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationStatusWithHttpInfo(String tenantId, String notificationId, String newStatus, [ ApiUpdateUserNotificationStatusOptions? options, ]) async {
-    final sso = options?.sso;
+  Future<Response> updateUserNotificationStatusWithHttpInfo(String tenantId, String notificationId, String newStatus, [ String? sso, ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark/{newStatus}'
       .replaceAll('{notificationId}', notificationId)
@@ -3805,8 +3786,8 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(String tenantId, String notificationId, String newStatus, [ ApiUpdateUserNotificationStatusOptions? options, ]) async {
-    final response = await updateUserNotificationStatusWithHttpInfo(tenantId, notificationId, newStatus, options,);
+  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(String tenantId, String notificationId, String newStatus, [ String? sso, ]) async {
+    final response = await updateUserNotificationStatusWithHttpInfo(tenantId, notificationId, newStatus, sso,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3993,22 +3974,6 @@ class PublicApi {
   }
 }
 
-/// Optional parameters for [PublicApi.blockFromCommentPublic].
-class ApiBlockFromCommentPublicOptions {
-  const ApiBlockFromCommentPublicOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
-/// Optional parameters for [PublicApi.checkedCommentsForBlocked].
-class ApiCheckedCommentsForBlockedOptions {
-  const ApiCheckedCommentsForBlockedOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.createCommentPublic].
 class ApiCreateCommentPublicOptions {
   const ApiCreateCommentPublicOptions({
@@ -4029,22 +3994,6 @@ class ApiCreateFeedPostPublicOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.createV1PageReact].
-class ApiCreateV1PageReactOptions {
-  const ApiCreateV1PageReactOptions({
-    this.title,
-  });
-  final String? title;
-}
-
-/// Optional parameters for [PublicApi.createV2PageReact].
-class ApiCreateV2PageReactOptions {
-  const ApiCreateV2PageReactOptions({
-    this.title,
-  });
-  final String? title;
-}
-
 /// Optional parameters for [PublicApi.deleteCommentPublic].
 class ApiDeleteCommentPublicOptions {
   const ApiDeleteCommentPublicOptions({
@@ -4075,14 +4024,6 @@ class ApiDeleteFeedPostPublicOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.flagCommentPublic].
-class ApiFlagCommentPublicOptions {
-  const ApiFlagCommentPublicOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.getCommentText].
 class ApiGetCommentTextOptions {
   const ApiGetCommentTextOptions({
@@ -4093,14 +4034,6 @@ class ApiGetCommentTextOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.getCommentVoteUserNames].
-class ApiGetCommentVoteUserNamesOptions {
-  const ApiGetCommentVoteUserNamesOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.getCommentsForUser].
 class ApiGetCommentsForUserOptions {
   const ApiGetCommentsForUserOptions({
@@ -4179,14 +4112,6 @@ class ApiGetCommentsPublicOptions {
   final String? beforeCommentId;
 }
 
-/// Optional parameters for [PublicApi.getEventLog].
-class ApiGetEventLogOptions {
-  const ApiGetEventLogOptions({
-    this.endTime,
-  });
-  final int? endTime;
-}
-
 /// Optional parameters for [PublicApi.getFeedPostsPublic].
 class ApiGetFeedPostsPublicOptions {
   const ApiGetFeedPostsPublicOptions({
@@ -4205,14 +4130,6 @@ class ApiGetFeedPostsPublicOptions {
   final bool? includeUserInfo;
 }
 
-/// Optional parameters for [PublicApi.getFeedPostsStats].
-class ApiGetFeedPostsStatsOptions {
-  const ApiGetFeedPostsStatsOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.getGifsSearch].
 class ApiGetGifsSearchOptions {
   const ApiGetGifsSearchOptions({
@@ -4237,14 +4154,6 @@ class ApiGetGifsTrendingOptions {
   final double? page;
 }
 
-/// Optional parameters for [PublicApi.getGlobalEventLog].
-class ApiGetGlobalEventLogOptions {
-  const ApiGetGlobalEventLogOptions({
-    this.endTime,
-  });
-  final int? endTime;
-}
-
 /// Optional parameters for [PublicApi.getOfflineUsers].
 class ApiGetOfflineUsersOptions {
   const ApiGetOfflineUsersOptions({
@@ -4291,14 +4200,6 @@ class ApiGetTranslationsOptions {
   final bool? useFullTranslationIds;
 }
 
-/// Optional parameters for [PublicApi.getUserNotificationCount].
-class ApiGetUserNotificationCountOptions {
-  const ApiGetUserNotificationCountOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.getUserNotifications].
 class ApiGetUserNotificationsOptions {
   const ApiGetUserNotificationsOptions({
@@ -4337,22 +4238,6 @@ class ApiGetUserReactsPublicOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.lockComment].
-class ApiLockCommentOptions {
-  const ApiLockCommentOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
-/// Optional parameters for [PublicApi.pinComment].
-class ApiPinCommentOptions {
-  const ApiPinCommentOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.reactFeedPostPublic].
 class ApiReactFeedPostPublicOptions {
   const ApiReactFeedPostPublicOptions({
@@ -4365,14 +4250,6 @@ class ApiReactFeedPostPublicOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.resetUserNotificationCount].
-class ApiResetUserNotificationCountOptions {
-  const ApiResetUserNotificationCountOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.resetUserNotifications].
 class ApiResetUserNotificationsOptions {
   const ApiResetUserNotificationsOptions({
@@ -4415,30 +4292,6 @@ class ApiSetCommentTextOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.unBlockCommentPublic].
-class ApiUnBlockCommentPublicOptions {
-  const ApiUnBlockCommentPublicOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
-/// Optional parameters for [PublicApi.unLockComment].
-class ApiUnLockCommentOptions {
-  const ApiUnLockCommentOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
-/// Optional parameters for [PublicApi.unPinComment].
-class ApiUnPinCommentOptions {
-  const ApiUnPinCommentOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.updateFeedPostPublic].
 class ApiUpdateFeedPostPublicOptions {
   const ApiUpdateFeedPostPublicOptions({
@@ -4449,30 +4302,6 @@ class ApiUpdateFeedPostPublicOptions {
   final String? sso;
 }
 
-/// Optional parameters for [PublicApi.updateUserNotificationCommentSubscriptionStatus].
-class ApiUpdateUserNotificationCommentSubscriptionStatusOptions {
-  const ApiUpdateUserNotificationCommentSubscriptionStatusOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
-/// Optional parameters for [PublicApi.updateUserNotificationPageSubscriptionStatus].
-class ApiUpdateUserNotificationPageSubscriptionStatusOptions {
-  const ApiUpdateUserNotificationPageSubscriptionStatusOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
-/// Optional parameters for [PublicApi.updateUserNotificationStatus].
-class ApiUpdateUserNotificationStatusOptions {
-  const ApiUpdateUserNotificationStatusOptions({
-    this.sso,
-  });
-  final String? sso;
-}
-
 /// Optional parameters for [PublicApi.uploadImage].
 class ApiUploadImageOptions {
   const ApiUploadImageOptions({

From 46cbd3bcf5d7b569552e863c070e02cffebe72af Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Mon, 29 Jun 2026 11:54:37 -0700
Subject: [PATCH 6/9] Regenerate: drop trailing comma in 0-optional op
 signatures/calls

createTenant(String tenantId, CreateTenantBody createTenantBody) etc. no longer have a dangling trailing comma; 1-optional ([T? x]) and 2+ ([Api<Op>Options? options]) forms unchanged.
---
 client/doc/DefaultApi.md           | 232 +++++-----
 client/doc/PublicApi.md            |  32 +-
 client/lib/api/default_api.dart    | 684 ++++++++++++++---------------
 client/lib/api/moderation_api.dart | 258 +++++------
 client/lib/api/public_api.dart     | 306 ++++++-------
 5 files changed, 756 insertions(+), 756 deletions(-)

diff --git a/client/doc/DefaultApi.md b/client/doc/DefaultApi.md
index d73675b..388747e 100644
--- a/client/doc/DefaultApi.md
+++ b/client/doc/DefaultApi.md
@@ -126,7 +126,7 @@ Method | HTTP request | Description
 
 
 # **addDomainConfig**
-> AddDomainConfigResponse addDomainConfig(tenantId, addDomainConfigParams, )
+> AddDomainConfigResponse addDomainConfig(tenantId, addDomainConfigParams)
 
 
 
@@ -143,7 +143,7 @@ final tenantId = tenantId_example; // String |
 final addDomainConfigParams = AddDomainConfigParams(); // AddDomainConfigParams | 
 
 try {
-    final result = api_instance.addDomainConfig(tenantId, addDomainConfigParams, );
+    final result = api_instance.addDomainConfig(tenantId, addDomainConfigParams);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addDomainConfig: $e\n');
@@ -267,7 +267,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addPage**
-> AddPageAPIResponse addPage(tenantId, createAPIPageData, )
+> AddPageAPIResponse addPage(tenantId, createAPIPageData)
 
 
 
@@ -284,7 +284,7 @@ final tenantId = tenantId_example; // String |
 final createAPIPageData = CreateAPIPageData(); // CreateAPIPageData | 
 
 try {
-    final result = api_instance.addPage(tenantId, createAPIPageData, );
+    final result = api_instance.addPage(tenantId, createAPIPageData);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addPage: $e\n');
@@ -314,7 +314,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addSSOUser**
-> AddSSOUserAPIResponse addSSOUser(tenantId, createAPISSOUserData, )
+> AddSSOUserAPIResponse addSSOUser(tenantId, createAPISSOUserData)
 
 
 
@@ -331,7 +331,7 @@ final tenantId = tenantId_example; // String |
 final createAPISSOUserData = CreateAPISSOUserData(); // CreateAPISSOUserData | 
 
 try {
-    final result = api_instance.addSSOUser(tenantId, createAPISSOUserData, );
+    final result = api_instance.addSSOUser(tenantId, createAPISSOUserData);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addSSOUser: $e\n');
@@ -573,7 +573,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **changeTicketState**
-> ChangeTicketStateResponse changeTicketState(tenantId, userId, id, changeTicketStateBody, )
+> ChangeTicketStateResponse changeTicketState(tenantId, userId, id, changeTicketStateBody)
 
 
 
@@ -592,7 +592,7 @@ final id = id_example; // String |
 final changeTicketStateBody = ChangeTicketStateBody(); // ChangeTicketStateBody | 
 
 try {
-    final result = api_instance.changeTicketState(tenantId, userId, id, changeTicketStateBody, );
+    final result = api_instance.changeTicketState(tenantId, userId, id, changeTicketStateBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->changeTicketState: $e\n');
@@ -685,7 +685,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createEmailTemplate**
-> CreateEmailTemplateResponse createEmailTemplate(tenantId, createEmailTemplateBody, )
+> CreateEmailTemplateResponse createEmailTemplate(tenantId, createEmailTemplateBody)
 
 
 
@@ -702,7 +702,7 @@ final tenantId = tenantId_example; // String |
 final createEmailTemplateBody = CreateEmailTemplateBody(); // CreateEmailTemplateBody | 
 
 try {
-    final result = api_instance.createEmailTemplate(tenantId, createEmailTemplateBody, );
+    final result = api_instance.createEmailTemplate(tenantId, createEmailTemplateBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createEmailTemplate: $e\n');
@@ -787,7 +787,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createModerator**
-> CreateModeratorResponse createModerator(tenantId, createModeratorBody, )
+> CreateModeratorResponse createModerator(tenantId, createModeratorBody)
 
 
 
@@ -804,7 +804,7 @@ final tenantId = tenantId_example; // String |
 final createModeratorBody = CreateModeratorBody(); // CreateModeratorBody | 
 
 try {
-    final result = api_instance.createModerator(tenantId, createModeratorBody, );
+    final result = api_instance.createModerator(tenantId, createModeratorBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createModerator: $e\n');
@@ -834,7 +834,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createQuestionConfig**
-> CreateQuestionConfigResponse createQuestionConfig(tenantId, createQuestionConfigBody, )
+> CreateQuestionConfigResponse createQuestionConfig(tenantId, createQuestionConfigBody)
 
 
 
@@ -851,7 +851,7 @@ final tenantId = tenantId_example; // String |
 final createQuestionConfigBody = CreateQuestionConfigBody(); // CreateQuestionConfigBody | 
 
 try {
-    final result = api_instance.createQuestionConfig(tenantId, createQuestionConfigBody, );
+    final result = api_instance.createQuestionConfig(tenantId, createQuestionConfigBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createQuestionConfig: $e\n');
@@ -881,7 +881,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createQuestionResult**
-> CreateQuestionResultResponse createQuestionResult(tenantId, createQuestionResultBody, )
+> CreateQuestionResultResponse createQuestionResult(tenantId, createQuestionResultBody)
 
 
 
@@ -898,7 +898,7 @@ final tenantId = tenantId_example; // String |
 final createQuestionResultBody = CreateQuestionResultBody(); // CreateQuestionResultBody | 
 
 try {
-    final result = api_instance.createQuestionResult(tenantId, createQuestionResultBody, );
+    final result = api_instance.createQuestionResult(tenantId, createQuestionResultBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createQuestionResult: $e\n');
@@ -928,7 +928,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createSubscription**
-> CreateSubscriptionAPIResponse createSubscription(tenantId, createAPIUserSubscriptionData, )
+> CreateSubscriptionAPIResponse createSubscription(tenantId, createAPIUserSubscriptionData)
 
 
 
@@ -945,7 +945,7 @@ final tenantId = tenantId_example; // String |
 final createAPIUserSubscriptionData = CreateAPIUserSubscriptionData(); // CreateAPIUserSubscriptionData | 
 
 try {
-    final result = api_instance.createSubscription(tenantId, createAPIUserSubscriptionData, );
+    final result = api_instance.createSubscription(tenantId, createAPIUserSubscriptionData);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createSubscription: $e\n');
@@ -975,7 +975,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenant**
-> CreateTenantResponse createTenant(tenantId, createTenantBody, )
+> CreateTenantResponse createTenant(tenantId, createTenantBody)
 
 
 
@@ -992,7 +992,7 @@ final tenantId = tenantId_example; // String |
 final createTenantBody = CreateTenantBody(); // CreateTenantBody | 
 
 try {
-    final result = api_instance.createTenant(tenantId, createTenantBody, );
+    final result = api_instance.createTenant(tenantId, createTenantBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenant: $e\n');
@@ -1022,7 +1022,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenantPackage**
-> CreateTenantPackageResponse createTenantPackage(tenantId, createTenantPackageBody, )
+> CreateTenantPackageResponse createTenantPackage(tenantId, createTenantPackageBody)
 
 
 
@@ -1039,7 +1039,7 @@ final tenantId = tenantId_example; // String |
 final createTenantPackageBody = CreateTenantPackageBody(); // CreateTenantPackageBody | 
 
 try {
-    final result = api_instance.createTenantPackage(tenantId, createTenantPackageBody, );
+    final result = api_instance.createTenantPackage(tenantId, createTenantPackageBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenantPackage: $e\n');
@@ -1069,7 +1069,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTenantUser**
-> CreateTenantUserResponse createTenantUser(tenantId, createTenantUserBody, )
+> CreateTenantUserResponse createTenantUser(tenantId, createTenantUserBody)
 
 
 
@@ -1086,7 +1086,7 @@ final tenantId = tenantId_example; // String |
 final createTenantUserBody = CreateTenantUserBody(); // CreateTenantUserBody | 
 
 try {
-    final result = api_instance.createTenantUser(tenantId, createTenantUserBody, );
+    final result = api_instance.createTenantUser(tenantId, createTenantUserBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTenantUser: $e\n');
@@ -1116,7 +1116,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createTicket**
-> CreateTicketResponse createTicket(tenantId, userId, createTicketBody, )
+> CreateTicketResponse createTicket(tenantId, userId, createTicketBody)
 
 
 
@@ -1134,7 +1134,7 @@ final userId = userId_example; // String |
 final createTicketBody = CreateTicketBody(); // CreateTicketBody | 
 
 try {
-    final result = api_instance.createTicket(tenantId, userId, createTicketBody, );
+    final result = api_instance.createTicket(tenantId, userId, createTicketBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createTicket: $e\n');
@@ -1165,7 +1165,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUserBadge**
-> APICreateUserBadgeResponse createUserBadge(tenantId, createUserBadgeParams, )
+> APICreateUserBadgeResponse createUserBadge(tenantId, createUserBadgeParams)
 
 
 
@@ -1182,7 +1182,7 @@ final tenantId = tenantId_example; // String |
 final createUserBadgeParams = CreateUserBadgeParams(); // CreateUserBadgeParams | 
 
 try {
-    final result = api_instance.createUserBadge(tenantId, createUserBadgeParams, );
+    final result = api_instance.createUserBadge(tenantId, createUserBadgeParams);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createUserBadge: $e\n');
@@ -1316,7 +1316,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteDomainConfig**
-> DeleteDomainConfigResponse deleteDomainConfig(tenantId, domain, )
+> DeleteDomainConfigResponse deleteDomainConfig(tenantId, domain)
 
 
 
@@ -1333,7 +1333,7 @@ final tenantId = tenantId_example; // String |
 final domain = domain_example; // String | 
 
 try {
-    final result = api_instance.deleteDomainConfig(tenantId, domain, );
+    final result = api_instance.deleteDomainConfig(tenantId, domain);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteDomainConfig: $e\n');
@@ -1363,7 +1363,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteEmailTemplate**
-> APIEmptyResponse deleteEmailTemplate(tenantId, id, )
+> APIEmptyResponse deleteEmailTemplate(tenantId, id)
 
 
 
@@ -1380,7 +1380,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteEmailTemplate(tenantId, id, );
+    final result = api_instance.deleteEmailTemplate(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteEmailTemplate: $e\n');
@@ -1410,7 +1410,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteEmailTemplateRenderError**
-> APIEmptyResponse deleteEmailTemplateRenderError(tenantId, id, errorId, )
+> APIEmptyResponse deleteEmailTemplateRenderError(tenantId, id, errorId)
 
 
 
@@ -1428,7 +1428,7 @@ final id = id_example; // String |
 final errorId = errorId_example; // String | 
 
 try {
-    final result = api_instance.deleteEmailTemplateRenderError(tenantId, id, errorId, );
+    final result = api_instance.deleteEmailTemplateRenderError(tenantId, id, errorId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteEmailTemplateRenderError: $e\n');
@@ -1557,7 +1557,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteNotificationCount**
-> APIEmptyResponse deleteNotificationCount(tenantId, id, )
+> APIEmptyResponse deleteNotificationCount(tenantId, id)
 
 
 
@@ -1574,7 +1574,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteNotificationCount(tenantId, id, );
+    final result = api_instance.deleteNotificationCount(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteNotificationCount: $e\n');
@@ -1604,7 +1604,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deletePage**
-> DeletePageAPIResponse deletePage(tenantId, id, )
+> DeletePageAPIResponse deletePage(tenantId, id)
 
 
 
@@ -1621,7 +1621,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deletePage(tenantId, id, );
+    final result = api_instance.deletePage(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deletePage: $e\n');
@@ -1651,7 +1651,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deletePendingWebhookEvent**
-> APIEmptyResponse deletePendingWebhookEvent(tenantId, id, )
+> APIEmptyResponse deletePendingWebhookEvent(tenantId, id)
 
 
 
@@ -1668,7 +1668,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deletePendingWebhookEvent(tenantId, id, );
+    final result = api_instance.deletePendingWebhookEvent(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deletePendingWebhookEvent: $e\n');
@@ -1698,7 +1698,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteQuestionConfig**
-> APIEmptyResponse deleteQuestionConfig(tenantId, id, )
+> APIEmptyResponse deleteQuestionConfig(tenantId, id)
 
 
 
@@ -1715,7 +1715,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteQuestionConfig(tenantId, id, );
+    final result = api_instance.deleteQuestionConfig(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteQuestionConfig: $e\n');
@@ -1745,7 +1745,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteQuestionResult**
-> APIEmptyResponse deleteQuestionResult(tenantId, id, )
+> APIEmptyResponse deleteQuestionResult(tenantId, id)
 
 
 
@@ -1762,7 +1762,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteQuestionResult(tenantId, id, );
+    final result = api_instance.deleteQuestionResult(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteQuestionResult: $e\n');
@@ -1941,7 +1941,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenantPackage**
-> APIEmptyResponse deleteTenantPackage(tenantId, id, )
+> APIEmptyResponse deleteTenantPackage(tenantId, id)
 
 
 
@@ -1958,7 +1958,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteTenantPackage(tenantId, id, );
+    final result = api_instance.deleteTenantPackage(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenantPackage: $e\n');
@@ -2039,7 +2039,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteUserBadge**
-> APIEmptySuccessResponse deleteUserBadge(tenantId, id, )
+> APIEmptySuccessResponse deleteUserBadge(tenantId, id)
 
 
 
@@ -2056,7 +2056,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteUserBadge(tenantId, id, );
+    final result = api_instance.deleteUserBadge(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteUserBadge: $e\n');
@@ -2241,7 +2241,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCachedNotificationCount**
-> GetCachedNotificationCountResponse getCachedNotificationCount(tenantId, id, )
+> GetCachedNotificationCountResponse getCachedNotificationCount(tenantId, id)
 
 
 
@@ -2258,7 +2258,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getCachedNotificationCount(tenantId, id, );
+    final result = api_instance.getCachedNotificationCount(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getCachedNotificationCount: $e\n');
@@ -2288,7 +2288,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getComment**
-> APIGetCommentResponse getComment(tenantId, id, )
+> APIGetCommentResponse getComment(tenantId, id)
 
 
 
@@ -2305,7 +2305,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getComment(tenantId, id, );
+    final result = api_instance.getComment(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getComment: $e\n');
@@ -2412,7 +2412,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getDomainConfig**
-> GetDomainConfigResponse getDomainConfig(tenantId, domain, )
+> GetDomainConfigResponse getDomainConfig(tenantId, domain)
 
 
 
@@ -2429,7 +2429,7 @@ final tenantId = tenantId_example; // String |
 final domain = domain_example; // String | 
 
 try {
-    final result = api_instance.getDomainConfig(tenantId, domain, );
+    final result = api_instance.getDomainConfig(tenantId, domain);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getDomainConfig: $e\n');
@@ -2459,7 +2459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getDomainConfigs**
-> GetDomainConfigsResponse getDomainConfigs(tenantId, )
+> GetDomainConfigsResponse getDomainConfigs(tenantId)
 
 
 
@@ -2475,7 +2475,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getDomainConfigs(tenantId, );
+    final result = api_instance.getDomainConfigs(tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getDomainConfigs: $e\n');
@@ -2504,7 +2504,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplate**
-> GetEmailTemplateResponse getEmailTemplate(tenantId, id, )
+> GetEmailTemplateResponse getEmailTemplate(tenantId, id)
 
 
 
@@ -2521,7 +2521,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getEmailTemplate(tenantId, id, );
+    final result = api_instance.getEmailTemplate(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplate: $e\n');
@@ -2551,7 +2551,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getEmailTemplateDefinitions**
-> GetEmailTemplateDefinitionsResponse getEmailTemplateDefinitions(tenantId, )
+> GetEmailTemplateDefinitionsResponse getEmailTemplateDefinitions(tenantId)
 
 
 
@@ -2567,7 +2567,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getEmailTemplateDefinitions(tenantId, );
+    final result = api_instance.getEmailTemplateDefinitions(tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getEmailTemplateDefinitions: $e\n');
@@ -2792,7 +2792,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerator**
-> GetModeratorResponse getModerator(tenantId, id, )
+> GetModeratorResponse getModerator(tenantId, id)
 
 
 
@@ -2809,7 +2809,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getModerator(tenantId, id, );
+    final result = api_instance.getModerator(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getModerator: $e\n');
@@ -2998,7 +2998,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPageByURLId**
-> GetPageByURLIdAPIResponse getPageByURLId(tenantId, urlId, )
+> GetPageByURLIdAPIResponse getPageByURLId(tenantId, urlId)
 
 
 
@@ -3015,7 +3015,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getPageByURLId(tenantId, urlId, );
+    final result = api_instance.getPageByURLId(tenantId, urlId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPageByURLId: $e\n');
@@ -3045,7 +3045,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPages**
-> GetPagesAPIResponse getPages(tenantId, )
+> GetPagesAPIResponse getPages(tenantId)
 
 
 
@@ -3061,7 +3061,7 @@ final api_instance = DefaultApi();
 final tenantId = tenantId_example; // String | 
 
 try {
-    final result = api_instance.getPages(tenantId, );
+    final result = api_instance.getPages(tenantId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPages: $e\n');
@@ -3206,7 +3206,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionConfig**
-> GetQuestionConfigResponse getQuestionConfig(tenantId, id, )
+> GetQuestionConfigResponse getQuestionConfig(tenantId, id)
 
 
 
@@ -3223,7 +3223,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getQuestionConfig(tenantId, id, );
+    final result = api_instance.getQuestionConfig(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionConfig: $e\n');
@@ -3300,7 +3300,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionResult**
-> GetQuestionResultResponse getQuestionResult(tenantId, id, )
+> GetQuestionResultResponse getQuestionResult(tenantId, id)
 
 
 
@@ -3317,7 +3317,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getQuestionResult(tenantId, id, );
+    final result = api_instance.getQuestionResult(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionResult: $e\n');
@@ -3404,7 +3404,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUserByEmail**
-> GetSSOUserByEmailAPIResponse getSSOUserByEmail(tenantId, email, )
+> GetSSOUserByEmailAPIResponse getSSOUserByEmail(tenantId, email)
 
 
 
@@ -3421,7 +3421,7 @@ final tenantId = tenantId_example; // String |
 final email = email_example; // String | 
 
 try {
-    final result = api_instance.getSSOUserByEmail(tenantId, email, );
+    final result = api_instance.getSSOUserByEmail(tenantId, email);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUserByEmail: $e\n');
@@ -3451,7 +3451,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSSOUserById**
-> GetSSOUserByIdAPIResponse getSSOUserById(tenantId, id, )
+> GetSSOUserByIdAPIResponse getSSOUserById(tenantId, id)
 
 
 
@@ -3468,7 +3468,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getSSOUserById(tenantId, id, );
+    final result = api_instance.getSSOUserById(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getSSOUserById: $e\n');
@@ -3592,7 +3592,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenant**
-> GetTenantResponse getTenant(tenantId, id, )
+> GetTenantResponse getTenant(tenantId, id)
 
 
 
@@ -3609,7 +3609,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenant(tenantId, id, );
+    final result = api_instance.getTenant(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenant: $e\n');
@@ -3692,7 +3692,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantPackage**
-> GetTenantPackageResponse getTenantPackage(tenantId, id, )
+> GetTenantPackageResponse getTenantPackage(tenantId, id)
 
 
 
@@ -3709,7 +3709,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenantPackage(tenantId, id, );
+    final result = api_instance.getTenantPackage(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantPackage: $e\n');
@@ -3786,7 +3786,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantUser**
-> GetTenantUserResponse getTenantUser(tenantId, id, )
+> GetTenantUserResponse getTenantUser(tenantId, id)
 
 
 
@@ -3803,7 +3803,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getTenantUser(tenantId, id, );
+    final result = api_instance.getTenantUser(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantUser: $e\n');
@@ -4031,7 +4031,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUser**
-> GetUserResponse getUser(tenantId, id, )
+> GetUserResponse getUser(tenantId, id)
 
 
 
@@ -4048,7 +4048,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUser(tenantId, id, );
+    final result = api_instance.getUser(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUser: $e\n');
@@ -4078,7 +4078,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadge**
-> APIGetUserBadgeResponse getUserBadge(tenantId, id, )
+> APIGetUserBadgeResponse getUserBadge(tenantId, id)
 
 
 
@@ -4095,7 +4095,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUserBadge(tenantId, id, );
+    final result = api_instance.getUserBadge(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadge: $e\n');
@@ -4125,7 +4125,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressById**
-> APIGetUserBadgeProgressResponse getUserBadgeProgressById(tenantId, id, )
+> APIGetUserBadgeProgressResponse getUserBadgeProgressById(tenantId, id)
 
 
 
@@ -4142,7 +4142,7 @@ final tenantId = tenantId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getUserBadgeProgressById(tenantId, id, );
+    final result = api_instance.getUserBadgeProgressById(tenantId, id);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressById: $e\n');
@@ -4172,7 +4172,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressByUserId**
-> APIGetUserBadgeProgressResponse getUserBadgeProgressByUserId(tenantId, userId, )
+> APIGetUserBadgeProgressResponse getUserBadgeProgressByUserId(tenantId, userId)
 
 
 
@@ -4189,7 +4189,7 @@ final tenantId = tenantId_example; // String |
 final userId = userId_example; // String | 
 
 try {
-    final result = api_instance.getUserBadgeProgressByUserId(tenantId, userId, );
+    final result = api_instance.getUserBadgeProgressByUserId(tenantId, userId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressByUserId: $e\n');
@@ -4327,7 +4327,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getVotes**
-> GetVotesResponse getVotes(tenantId, urlId, )
+> GetVotesResponse getVotes(tenantId, urlId)
 
 
 
@@ -4344,7 +4344,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getVotes(tenantId, urlId, );
+    final result = api_instance.getVotes(tenantId, urlId);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getVotes: $e\n');
@@ -4425,7 +4425,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchDomainConfig**
-> PatchDomainConfigResponse patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams, )
+> PatchDomainConfigResponse patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams)
 
 
 
@@ -4443,7 +4443,7 @@ final domainToUpdate = domainToUpdate_example; // String |
 final patchDomainConfigParams = PatchDomainConfigParams(); // PatchDomainConfigParams | 
 
 try {
-    final result = api_instance.patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams, );
+    final result = api_instance.patchDomainConfig(tenantId, domainToUpdate, patchDomainConfigParams);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchDomainConfig: $e\n');
@@ -4523,7 +4523,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchPage**
-> PatchPageAPIResponse patchPage(tenantId, id, updateAPIPageData, )
+> PatchPageAPIResponse patchPage(tenantId, id, updateAPIPageData)
 
 
 
@@ -4541,7 +4541,7 @@ final id = id_example; // String |
 final updateAPIPageData = UpdateAPIPageData(); // UpdateAPIPageData | 
 
 try {
-    final result = api_instance.patchPage(tenantId, id, updateAPIPageData, );
+    final result = api_instance.patchPage(tenantId, id, updateAPIPageData);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchPage: $e\n');
@@ -4623,7 +4623,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putDomainConfig**
-> PutDomainConfigResponse putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams, )
+> PutDomainConfigResponse putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams)
 
 
 
@@ -4641,7 +4641,7 @@ final domainToUpdate = domainToUpdate_example; // String |
 final updateDomainConfigParams = UpdateDomainConfigParams(); // UpdateDomainConfigParams | 
 
 try {
-    final result = api_instance.putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams, );
+    final result = api_instance.putDomainConfig(tenantId, domainToUpdate, updateDomainConfigParams);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->putDomainConfig: $e\n');
@@ -4772,7 +4772,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **replaceTenantPackage**
-> APIEmptyResponse replaceTenantPackage(tenantId, id, replaceTenantPackageBody, )
+> APIEmptyResponse replaceTenantPackage(tenantId, id, replaceTenantPackageBody)
 
 
 
@@ -4790,7 +4790,7 @@ final id = id_example; // String |
 final replaceTenantPackageBody = ReplaceTenantPackageBody(); // ReplaceTenantPackageBody | 
 
 try {
-    final result = api_instance.replaceTenantPackage(tenantId, id, replaceTenantPackageBody, );
+    final result = api_instance.replaceTenantPackage(tenantId, id, replaceTenantPackageBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->replaceTenantPackage: $e\n');
@@ -4982,7 +4982,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **sendInvite**
-> APIEmptyResponse sendInvite(tenantId, id, fromName, )
+> APIEmptyResponse sendInvite(tenantId, id, fromName)
 
 
 
@@ -5000,7 +5000,7 @@ final id = id_example; // String |
 final fromName = fromName_example; // String | 
 
 try {
-    final result = api_instance.sendInvite(tenantId, id, fromName, );
+    final result = api_instance.sendInvite(tenantId, id, fromName);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->sendInvite: $e\n');
@@ -5239,7 +5239,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateEmailTemplate**
-> APIEmptyResponse updateEmailTemplate(tenantId, id, updateEmailTemplateBody, )
+> APIEmptyResponse updateEmailTemplate(tenantId, id, updateEmailTemplateBody)
 
 
 
@@ -5257,7 +5257,7 @@ final id = id_example; // String |
 final updateEmailTemplateBody = UpdateEmailTemplateBody(); // UpdateEmailTemplateBody | 
 
 try {
-    final result = api_instance.updateEmailTemplate(tenantId, id, updateEmailTemplateBody, );
+    final result = api_instance.updateEmailTemplate(tenantId, id, updateEmailTemplateBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateEmailTemplate: $e\n');
@@ -5288,7 +5288,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateFeedPost**
-> APIEmptyResponse updateFeedPost(tenantId, id, feedPost, )
+> APIEmptyResponse updateFeedPost(tenantId, id, feedPost)
 
 
 
@@ -5306,7 +5306,7 @@ final id = id_example; // String |
 final feedPost = FeedPost(); // FeedPost | 
 
 try {
-    final result = api_instance.updateFeedPost(tenantId, id, feedPost, );
+    final result = api_instance.updateFeedPost(tenantId, id, feedPost);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateFeedPost: $e\n');
@@ -5337,7 +5337,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateModerator**
-> APIEmptyResponse updateModerator(tenantId, id, updateModeratorBody, )
+> APIEmptyResponse updateModerator(tenantId, id, updateModeratorBody)
 
 
 
@@ -5355,7 +5355,7 @@ final id = id_example; // String |
 final updateModeratorBody = UpdateModeratorBody(); // UpdateModeratorBody | 
 
 try {
-    final result = api_instance.updateModerator(tenantId, id, updateModeratorBody, );
+    final result = api_instance.updateModerator(tenantId, id, updateModeratorBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateModerator: $e\n');
@@ -5437,7 +5437,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateQuestionConfig**
-> APIEmptyResponse updateQuestionConfig(tenantId, id, updateQuestionConfigBody, )
+> APIEmptyResponse updateQuestionConfig(tenantId, id, updateQuestionConfigBody)
 
 
 
@@ -5455,7 +5455,7 @@ final id = id_example; // String |
 final updateQuestionConfigBody = UpdateQuestionConfigBody(); // UpdateQuestionConfigBody | 
 
 try {
-    final result = api_instance.updateQuestionConfig(tenantId, id, updateQuestionConfigBody, );
+    final result = api_instance.updateQuestionConfig(tenantId, id, updateQuestionConfigBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateQuestionConfig: $e\n');
@@ -5486,7 +5486,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateQuestionResult**
-> APIEmptyResponse updateQuestionResult(tenantId, id, updateQuestionResultBody, )
+> APIEmptyResponse updateQuestionResult(tenantId, id, updateQuestionResultBody)
 
 
 
@@ -5504,7 +5504,7 @@ final id = id_example; // String |
 final updateQuestionResultBody = UpdateQuestionResultBody(); // UpdateQuestionResultBody | 
 
 try {
-    final result = api_instance.updateQuestionResult(tenantId, id, updateQuestionResultBody, );
+    final result = api_instance.updateQuestionResult(tenantId, id, updateQuestionResultBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateQuestionResult: $e\n');
@@ -5586,7 +5586,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenant**
-> APIEmptyResponse updateTenant(tenantId, id, updateTenantBody, )
+> APIEmptyResponse updateTenant(tenantId, id, updateTenantBody)
 
 
 
@@ -5604,7 +5604,7 @@ final id = id_example; // String |
 final updateTenantBody = UpdateTenantBody(); // UpdateTenantBody | 
 
 try {
-    final result = api_instance.updateTenant(tenantId, id, updateTenantBody, );
+    final result = api_instance.updateTenant(tenantId, id, updateTenantBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenant: $e\n');
@@ -5635,7 +5635,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateTenantPackage**
-> APIEmptyResponse updateTenantPackage(tenantId, id, updateTenantPackageBody, )
+> APIEmptyResponse updateTenantPackage(tenantId, id, updateTenantPackageBody)
 
 
 
@@ -5653,7 +5653,7 @@ final id = id_example; // String |
 final updateTenantPackageBody = UpdateTenantPackageBody(); // UpdateTenantPackageBody | 
 
 try {
-    final result = api_instance.updateTenantPackage(tenantId, id, updateTenantPackageBody, );
+    final result = api_instance.updateTenantPackage(tenantId, id, updateTenantPackageBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateTenantPackage: $e\n');
@@ -5735,7 +5735,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUserBadge**
-> APIEmptySuccessResponse updateUserBadge(tenantId, id, updateUserBadgeParams, )
+> APIEmptySuccessResponse updateUserBadge(tenantId, id, updateUserBadgeParams)
 
 
 
@@ -5753,7 +5753,7 @@ final id = id_example; // String |
 final updateUserBadgeParams = UpdateUserBadgeParams(); // UpdateUserBadgeParams | 
 
 try {
-    final result = api_instance.updateUserBadge(tenantId, id, updateUserBadgeParams, );
+    final result = api_instance.updateUserBadge(tenantId, id, updateUserBadgeParams);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateUserBadge: $e\n');
diff --git a/client/doc/PublicApi.md b/client/doc/PublicApi.md
index 2bff1a0..a45ecdb 100644
--- a/client/doc/PublicApi.md
+++ b/client/doc/PublicApi.md
@@ -495,7 +495,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteV1PageReact**
-> CreateV1PageReact deleteV1PageReact(tenantId, urlId, )
+> CreateV1PageReact deleteV1PageReact(tenantId, urlId)
 
 
 
@@ -508,7 +508,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.deleteV1PageReact(tenantId, urlId, );
+    final result = api_instance.deleteV1PageReact(tenantId, urlId);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteV1PageReact: $e\n');
@@ -538,7 +538,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteV2PageReact**
-> CreateV1PageReact deleteV2PageReact(tenantId, urlId, id, )
+> CreateV1PageReact deleteV2PageReact(tenantId, urlId, id)
 
 
 
@@ -552,7 +552,7 @@ final urlId = urlId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.deleteV2PageReact(tenantId, urlId, id, );
+    final result = api_instance.deleteV2PageReact(tenantId, urlId, id);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteV2PageReact: $e\n');
@@ -1025,7 +1025,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifLarge**
-> GifGetLargeResponse getGifLarge(tenantId, largeInternalURLSanitized, )
+> GifGetLargeResponse getGifLarge(tenantId, largeInternalURLSanitized)
 
 
 
@@ -1038,7 +1038,7 @@ final tenantId = tenantId_example; // String |
 final largeInternalURLSanitized = largeInternalURLSanitized_example; // String | 
 
 try {
-    final result = api_instance.getGifLarge(tenantId, largeInternalURLSanitized, );
+    final result = api_instance.getGifLarge(tenantId, largeInternalURLSanitized);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifLarge: $e\n');
@@ -1519,7 +1519,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserPresenceStatuses**
-> GetUserPresenceStatusesResponse getUserPresenceStatuses(tenantId, urlIdWS, userIds, )
+> GetUserPresenceStatusesResponse getUserPresenceStatuses(tenantId, urlIdWS, userIds)
 
 
 
@@ -1533,7 +1533,7 @@ final urlIdWS = urlIdWS_example; // String |
 final userIds = userIds_example; // String | 
 
 try {
-    final result = api_instance.getUserPresenceStatuses(tenantId, urlIdWS, userIds, );
+    final result = api_instance.getUserPresenceStatuses(tenantId, urlIdWS, userIds);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserPresenceStatuses: $e\n');
@@ -1609,7 +1609,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUsersInfo**
-> PageUsersInfoResponse getUsersInfo(tenantId, ids, )
+> PageUsersInfoResponse getUsersInfo(tenantId, ids)
 
 
 
@@ -1624,7 +1624,7 @@ final tenantId = tenantId_example; // String |
 final ids = ids_example; // String | Comma-delimited userIds.
 
 try {
-    final result = api_instance.getUsersInfo(tenantId, ids, );
+    final result = api_instance.getUsersInfo(tenantId, ids);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUsersInfo: $e\n');
@@ -1654,7 +1654,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV1PageLikes**
-> GetV1PageLikes getV1PageLikes(tenantId, urlId, )
+> GetV1PageLikes getV1PageLikes(tenantId, urlId)
 
 
 
@@ -1667,7 +1667,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getV1PageLikes(tenantId, urlId, );
+    final result = api_instance.getV1PageLikes(tenantId, urlId);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV1PageLikes: $e\n');
@@ -1697,7 +1697,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV2PageReactUsers**
-> GetV2PageReactUsersResponse getV2PageReactUsers(tenantId, urlId, id, )
+> GetV2PageReactUsersResponse getV2PageReactUsers(tenantId, urlId, id)
 
 
 
@@ -1711,7 +1711,7 @@ final urlId = urlId_example; // String |
 final id = id_example; // String | 
 
 try {
-    final result = api_instance.getV2PageReactUsers(tenantId, urlId, id, );
+    final result = api_instance.getV2PageReactUsers(tenantId, urlId, id);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV2PageReactUsers: $e\n');
@@ -1742,7 +1742,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getV2PageReacts**
-> GetV2PageReacts getV2PageReacts(tenantId, urlId, )
+> GetV2PageReacts getV2PageReacts(tenantId, urlId)
 
 
 
@@ -1755,7 +1755,7 @@ final tenantId = tenantId_example; // String |
 final urlId = urlId_example; // String | 
 
 try {
-    final result = api_instance.getV2PageReacts(tenantId, urlId, );
+    final result = api_instance.getV2PageReacts(tenantId, urlId);
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getV2PageReacts: $e\n');
diff --git a/client/lib/api/default_api.dart b/client/lib/api/default_api.dart
index 877c688..0e7ad0b 100644
--- a/client/lib/api/default_api.dart
+++ b/client/lib/api/default_api.dart
@@ -22,7 +22,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [AddDomainConfigParams] addDomainConfigParams (required):
-  Future<Response> addDomainConfigWithHttpInfo(String tenantId, AddDomainConfigParams addDomainConfigParams, ) async {
+  Future<Response> addDomainConfigWithHttpInfo(String tenantId, AddDomainConfigParams addDomainConfigParams) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs';
 
@@ -54,8 +54,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [AddDomainConfigParams] addDomainConfigParams (required):
-  Future<AddDomainConfigResponse?> addDomainConfig(String tenantId, AddDomainConfigParams addDomainConfigParams, ) async {
-    final response = await addDomainConfigWithHttpInfo(tenantId, addDomainConfigParams, );
+  Future<AddDomainConfigResponse?> addDomainConfig(String tenantId, AddDomainConfigParams addDomainConfigParams) async {
+    final response = await addDomainConfigWithHttpInfo(tenantId, addDomainConfigParams);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -75,7 +75,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<Response> addHashTagWithHttpInfo(CreateHashTagBody createHashTagBody, [ String? tenantId, ]) async {
+  Future<Response> addHashTagWithHttpInfo(CreateHashTagBody createHashTagBody, [ String? tenantId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -109,8 +109,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<CreateHashTagResponse?> addHashTag(CreateHashTagBody createHashTagBody, [ String? tenantId, ]) async {
-    final response = await addHashTagWithHttpInfo(createHashTagBody, tenantId,);
+  Future<CreateHashTagResponse?> addHashTag(CreateHashTagBody createHashTagBody, [ String? tenantId ]) async {
+    final response = await addHashTagWithHttpInfo(createHashTagBody, tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -130,7 +130,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<Response> addHashTagsBulkWithHttpInfo(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId, ]) async {
+  Future<Response> addHashTagsBulkWithHttpInfo(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/bulk';
 
@@ -164,8 +164,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId, ]) async {
-    final response = await addHashTagsBulkWithHttpInfo(bulkCreateHashTagsBody, tenantId,);
+  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId ]) async {
+    final response = await addHashTagsBulkWithHttpInfo(bulkCreateHashTagsBody, tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -185,7 +185,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIPageData] createAPIPageData (required):
-  Future<Response> addPageWithHttpInfo(String tenantId, CreateAPIPageData createAPIPageData, ) async {
+  Future<Response> addPageWithHttpInfo(String tenantId, CreateAPIPageData createAPIPageData) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages';
 
@@ -217,8 +217,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIPageData] createAPIPageData (required):
-  Future<AddPageAPIResponse?> addPage(String tenantId, CreateAPIPageData createAPIPageData, ) async {
-    final response = await addPageWithHttpInfo(tenantId, createAPIPageData, );
+  Future<AddPageAPIResponse?> addPage(String tenantId, CreateAPIPageData createAPIPageData) async {
+    final response = await addPageWithHttpInfo(tenantId, createAPIPageData);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -238,7 +238,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPISSOUserData] createAPISSOUserData (required):
-  Future<Response> addSSOUserWithHttpInfo(String tenantId, CreateAPISSOUserData createAPISSOUserData, ) async {
+  Future<Response> addSSOUserWithHttpInfo(String tenantId, CreateAPISSOUserData createAPISSOUserData) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -270,8 +270,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPISSOUserData] createAPISSOUserData (required):
-  Future<AddSSOUserAPIResponse?> addSSOUser(String tenantId, CreateAPISSOUserData createAPISSOUserData, ) async {
-    final response = await addSSOUserWithHttpInfo(tenantId, createAPISSOUserData, );
+  Future<AddSSOUserAPIResponse?> addSSOUser(String tenantId, CreateAPISSOUserData createAPISSOUserData) async {
+    final response = await addSSOUserWithHttpInfo(tenantId, createAPISSOUserData);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -298,7 +298,7 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<Response> aggregateWithHttpInfo(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options, ]) async {
+  Future<Response> aggregateWithHttpInfo(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options ]) async {
     final parentTenantId = options?.parentTenantId;
     final includeStats = options?.includeStats;
     // ignore: prefer_const_declarations
@@ -344,8 +344,8 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<AggregateResponse?> aggregate(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options, ]) async {
-    final response = await aggregateWithHttpInfo(tenantId, aggregationRequest, options,);
+  Future<AggregateResponse?> aggregate(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options ]) async {
+    final response = await aggregateWithHttpInfo(tenantId, aggregationRequest, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -375,7 +375,7 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> aggregateQuestionResultsWithHttpInfo(String tenantId, [ ApiAggregateQuestionResultsOptions? options, ]) async {
+  Future<Response> aggregateQuestionResultsWithHttpInfo(String tenantId, [ ApiAggregateQuestionResultsOptions? options ]) async {
     final questionId = options?.questionId;
     final questionIds = options?.questionIds;
     final urlId = options?.urlId;
@@ -441,8 +441,8 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(String tenantId, [ ApiAggregateQuestionResultsOptions? options, ]) async {
-    final response = await aggregateQuestionResultsWithHttpInfo(tenantId, options,);
+  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(String tenantId, [ ApiAggregateQuestionResultsOptions? options ]) async {
+    final response = await aggregateQuestionResultsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -468,7 +468,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> blockUserFromCommentWithHttpInfo(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options, ]) async {
+  Future<Response> blockUserFromCommentWithHttpInfo(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -515,8 +515,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<BlockSuccess?> blockUserFromComment(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options, ]) async {
-    final response = await blockUserFromCommentWithHttpInfo(tenantId, id, blockFromCommentParams, options,);
+  Future<BlockSuccess?> blockUserFromComment(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options ]) async {
+    final response = await blockUserFromCommentWithHttpInfo(tenantId, id, blockFromCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -538,7 +538,7 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ bool? forceRecalculate, ]) async {
+  Future<Response> bulkAggregateQuestionResultsWithHttpInfo(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ bool? forceRecalculate ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results-aggregation/bulk';
 
@@ -575,8 +575,8 @@ class DefaultApi {
   /// * [BulkAggregateQuestionResultsRequest] bulkAggregateQuestionResultsRequest (required):
   ///
   /// * [bool] forceRecalculate:
-  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ bool? forceRecalculate, ]) async {
-    final response = await bulkAggregateQuestionResultsWithHttpInfo(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate,);
+  Future<BulkAggregateQuestionResultsResponse?> bulkAggregateQuestionResults(String tenantId, BulkAggregateQuestionResultsRequest bulkAggregateQuestionResultsRequest, [ bool? forceRecalculate ]) async {
+    final response = await bulkAggregateQuestionResultsWithHttpInfo(tenantId, bulkAggregateQuestionResultsRequest, forceRecalculate);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -600,7 +600,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ChangeTicketStateBody] changeTicketStateBody (required):
-  Future<Response> changeTicketStateWithHttpInfo(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody, ) async {
+  Future<Response> changeTicketStateWithHttpInfo(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}/state'
       .replaceAll('{id}', id);
@@ -638,8 +638,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ChangeTicketStateBody] changeTicketStateBody (required):
-  Future<ChangeTicketStateResponse?> changeTicketState(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody, ) async {
-    final response = await changeTicketStateWithHttpInfo(tenantId, userId, id, changeTicketStateBody, );
+  Future<ChangeTicketStateResponse?> changeTicketState(String tenantId, String userId, String id, ChangeTicketStateBody changeTicketStateBody) async {
+    final response = await changeTicketStateWithHttpInfo(tenantId, userId, id, changeTicketStateBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -673,7 +673,7 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options, ]) async {
+  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options ]) async {
     final questionId = options?.questionId;
     final questionIds = options?.questionIds;
     final urlId = options?.urlId;
@@ -751,8 +751,8 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options, ]) async {
-    final response = await combineCommentsWithQuestionResultsWithHttpInfo(tenantId, options,);
+  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options ]) async {
+    final response = await combineCommentsWithQuestionResultsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -772,7 +772,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateEmailTemplateBody] createEmailTemplateBody (required):
-  Future<Response> createEmailTemplateWithHttpInfo(String tenantId, CreateEmailTemplateBody createEmailTemplateBody, ) async {
+  Future<Response> createEmailTemplateWithHttpInfo(String tenantId, CreateEmailTemplateBody createEmailTemplateBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -804,8 +804,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateEmailTemplateBody] createEmailTemplateBody (required):
-  Future<CreateEmailTemplateResponse?> createEmailTemplate(String tenantId, CreateEmailTemplateBody createEmailTemplateBody, ) async {
-    final response = await createEmailTemplateWithHttpInfo(tenantId, createEmailTemplateBody, );
+  Future<CreateEmailTemplateResponse?> createEmailTemplate(String tenantId, CreateEmailTemplateBody createEmailTemplateBody) async {
+    final response = await createEmailTemplateWithHttpInfo(tenantId, createEmailTemplateBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -833,7 +833,7 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<Response> createFeedPostWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options, ]) async {
+  Future<Response> createFeedPostWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final isLive = options?.isLive;
     final doSpamCheck = options?.doSpamCheck;
@@ -889,8 +889,8 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<CreateFeedPostsResponse?> createFeedPost(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options, ]) async {
-    final response = await createFeedPostWithHttpInfo(tenantId, createFeedPostParams, options,);
+  Future<CreateFeedPostsResponse?> createFeedPost(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options ]) async {
+    final response = await createFeedPostWithHttpInfo(tenantId, createFeedPostParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -910,7 +910,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateModeratorBody] createModeratorBody (required):
-  Future<Response> createModeratorWithHttpInfo(String tenantId, CreateModeratorBody createModeratorBody, ) async {
+  Future<Response> createModeratorWithHttpInfo(String tenantId, CreateModeratorBody createModeratorBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -942,8 +942,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateModeratorBody] createModeratorBody (required):
-  Future<CreateModeratorResponse?> createModerator(String tenantId, CreateModeratorBody createModeratorBody, ) async {
-    final response = await createModeratorWithHttpInfo(tenantId, createModeratorBody, );
+  Future<CreateModeratorResponse?> createModerator(String tenantId, CreateModeratorBody createModeratorBody) async {
+    final response = await createModeratorWithHttpInfo(tenantId, createModeratorBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -963,7 +963,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionConfigBody] createQuestionConfigBody (required):
-  Future<Response> createQuestionConfigWithHttpInfo(String tenantId, CreateQuestionConfigBody createQuestionConfigBody, ) async {
+  Future<Response> createQuestionConfigWithHttpInfo(String tenantId, CreateQuestionConfigBody createQuestionConfigBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -995,8 +995,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionConfigBody] createQuestionConfigBody (required):
-  Future<CreateQuestionConfigResponse?> createQuestionConfig(String tenantId, CreateQuestionConfigBody createQuestionConfigBody, ) async {
-    final response = await createQuestionConfigWithHttpInfo(tenantId, createQuestionConfigBody, );
+  Future<CreateQuestionConfigResponse?> createQuestionConfig(String tenantId, CreateQuestionConfigBody createQuestionConfigBody) async {
+    final response = await createQuestionConfigWithHttpInfo(tenantId, createQuestionConfigBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1016,7 +1016,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionResultBody] createQuestionResultBody (required):
-  Future<Response> createQuestionResultWithHttpInfo(String tenantId, CreateQuestionResultBody createQuestionResultBody, ) async {
+  Future<Response> createQuestionResultWithHttpInfo(String tenantId, CreateQuestionResultBody createQuestionResultBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results';
 
@@ -1048,8 +1048,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateQuestionResultBody] createQuestionResultBody (required):
-  Future<CreateQuestionResultResponse?> createQuestionResult(String tenantId, CreateQuestionResultBody createQuestionResultBody, ) async {
-    final response = await createQuestionResultWithHttpInfo(tenantId, createQuestionResultBody, );
+  Future<CreateQuestionResultResponse?> createQuestionResult(String tenantId, CreateQuestionResultBody createQuestionResultBody) async {
+    final response = await createQuestionResultWithHttpInfo(tenantId, createQuestionResultBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1069,7 +1069,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIUserSubscriptionData] createAPIUserSubscriptionData (required):
-  Future<Response> createSubscriptionWithHttpInfo(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData, ) async {
+  Future<Response> createSubscriptionWithHttpInfo(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -1101,8 +1101,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateAPIUserSubscriptionData] createAPIUserSubscriptionData (required):
-  Future<CreateSubscriptionAPIResponse?> createSubscription(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData, ) async {
-    final response = await createSubscriptionWithHttpInfo(tenantId, createAPIUserSubscriptionData, );
+  Future<CreateSubscriptionAPIResponse?> createSubscription(String tenantId, CreateAPIUserSubscriptionData createAPIUserSubscriptionData) async {
+    final response = await createSubscriptionWithHttpInfo(tenantId, createAPIUserSubscriptionData);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1122,7 +1122,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantBody] createTenantBody (required):
-  Future<Response> createTenantWithHttpInfo(String tenantId, CreateTenantBody createTenantBody, ) async {
+  Future<Response> createTenantWithHttpInfo(String tenantId, CreateTenantBody createTenantBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants';
 
@@ -1154,8 +1154,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantBody] createTenantBody (required):
-  Future<CreateTenantResponse?> createTenant(String tenantId, CreateTenantBody createTenantBody, ) async {
-    final response = await createTenantWithHttpInfo(tenantId, createTenantBody, );
+  Future<CreateTenantResponse?> createTenant(String tenantId, CreateTenantBody createTenantBody) async {
+    final response = await createTenantWithHttpInfo(tenantId, createTenantBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1175,7 +1175,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantPackageBody] createTenantPackageBody (required):
-  Future<Response> createTenantPackageWithHttpInfo(String tenantId, CreateTenantPackageBody createTenantPackageBody, ) async {
+  Future<Response> createTenantPackageWithHttpInfo(String tenantId, CreateTenantPackageBody createTenantPackageBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -1207,8 +1207,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantPackageBody] createTenantPackageBody (required):
-  Future<CreateTenantPackageResponse?> createTenantPackage(String tenantId, CreateTenantPackageBody createTenantPackageBody, ) async {
-    final response = await createTenantPackageWithHttpInfo(tenantId, createTenantPackageBody, );
+  Future<CreateTenantPackageResponse?> createTenantPackage(String tenantId, CreateTenantPackageBody createTenantPackageBody) async {
+    final response = await createTenantPackageWithHttpInfo(tenantId, createTenantPackageBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1228,7 +1228,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantUserBody] createTenantUserBody (required):
-  Future<Response> createTenantUserWithHttpInfo(String tenantId, CreateTenantUserBody createTenantUserBody, ) async {
+  Future<Response> createTenantUserWithHttpInfo(String tenantId, CreateTenantUserBody createTenantUserBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -1260,8 +1260,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateTenantUserBody] createTenantUserBody (required):
-  Future<CreateTenantUserResponse?> createTenantUser(String tenantId, CreateTenantUserBody createTenantUserBody, ) async {
-    final response = await createTenantUserWithHttpInfo(tenantId, createTenantUserBody, );
+  Future<CreateTenantUserResponse?> createTenantUser(String tenantId, CreateTenantUserBody createTenantUserBody) async {
+    final response = await createTenantUserWithHttpInfo(tenantId, createTenantUserBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1283,7 +1283,7 @@ class DefaultApi {
   /// * [String] userId (required):
   ///
   /// * [CreateTicketBody] createTicketBody (required):
-  Future<Response> createTicketWithHttpInfo(String tenantId, String userId, CreateTicketBody createTicketBody, ) async {
+  Future<Response> createTicketWithHttpInfo(String tenantId, String userId, CreateTicketBody createTicketBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets';
 
@@ -1318,8 +1318,8 @@ class DefaultApi {
   /// * [String] userId (required):
   ///
   /// * [CreateTicketBody] createTicketBody (required):
-  Future<CreateTicketResponse?> createTicket(String tenantId, String userId, CreateTicketBody createTicketBody, ) async {
-    final response = await createTicketWithHttpInfo(tenantId, userId, createTicketBody, );
+  Future<CreateTicketResponse?> createTicket(String tenantId, String userId, CreateTicketBody createTicketBody) async {
+    final response = await createTicketWithHttpInfo(tenantId, userId, createTicketBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1339,7 +1339,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateUserBadgeParams] createUserBadgeParams (required):
-  Future<Response> createUserBadgeWithHttpInfo(String tenantId, CreateUserBadgeParams createUserBadgeParams, ) async {
+  Future<Response> createUserBadgeWithHttpInfo(String tenantId, CreateUserBadgeParams createUserBadgeParams) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges';
 
@@ -1371,8 +1371,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [CreateUserBadgeParams] createUserBadgeParams (required):
-  Future<APICreateUserBadgeResponse?> createUserBadge(String tenantId, CreateUserBadgeParams createUserBadgeParams, ) async {
-    final response = await createUserBadgeWithHttpInfo(tenantId, createUserBadgeParams, );
+  Future<APICreateUserBadgeResponse?> createUserBadge(String tenantId, CreateUserBadgeParams createUserBadgeParams) async {
+    final response = await createUserBadgeWithHttpInfo(tenantId, createUserBadgeParams);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1398,7 +1398,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> createVoteWithHttpInfo(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options, ]) async {
+  Future<Response> createVoteWithHttpInfo(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -1446,8 +1446,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<VoteResponse?> createVote(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options, ]) async {
-    final response = await createVoteWithHttpInfo(tenantId, commentId, direction, options,);
+  Future<VoteResponse?> createVote(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options ]) async {
+    final response = await createVoteWithHttpInfo(tenantId, commentId, direction, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1471,7 +1471,7 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<Response> deleteCommentWithHttpInfo(String tenantId, String id, [ ApiDeleteCommentOptions? options, ]) async {
+  Future<Response> deleteCommentWithHttpInfo(String tenantId, String id, [ ApiDeleteCommentOptions? options ]) async {
     final contextUserId = options?.contextUserId;
     final isLive = options?.isLive;
     // ignore: prefer_const_declarations
@@ -1516,8 +1516,8 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<DeleteCommentResult?> deleteComment(String tenantId, String id, [ ApiDeleteCommentOptions? options, ]) async {
-    final response = await deleteCommentWithHttpInfo(tenantId, id, options,);
+  Future<DeleteCommentResult?> deleteComment(String tenantId, String id, [ ApiDeleteCommentOptions? options ]) async {
+    final response = await deleteCommentWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1537,7 +1537,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<Response> deleteDomainConfigWithHttpInfo(String tenantId, String domain, ) async {
+  Future<Response> deleteDomainConfigWithHttpInfo(String tenantId, String domain) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domain}'
       .replaceAll('{domain}', domain);
@@ -1570,8 +1570,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<DeleteDomainConfigResponse?> deleteDomainConfig(String tenantId, String domain, ) async {
-    final response = await deleteDomainConfigWithHttpInfo(tenantId, domain, );
+  Future<DeleteDomainConfigResponse?> deleteDomainConfig(String tenantId, String domain) async {
+    final response = await deleteDomainConfigWithHttpInfo(tenantId, domain);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1591,7 +1591,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteEmailTemplateWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deleteEmailTemplateWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -1624,8 +1624,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteEmailTemplate(String tenantId, String id, ) async {
-    final response = await deleteEmailTemplateWithHttpInfo(tenantId, id, );
+  Future<APIEmptyResponse?> deleteEmailTemplate(String tenantId, String id) async {
+    final response = await deleteEmailTemplateWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1647,7 +1647,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] errorId (required):
-  Future<Response> deleteEmailTemplateRenderErrorWithHttpInfo(String tenantId, String id, String errorId, ) async {
+  Future<Response> deleteEmailTemplateRenderErrorWithHttpInfo(String tenantId, String id, String errorId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors/{errorId}'
       .replaceAll('{id}', id)
@@ -1683,8 +1683,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] errorId (required):
-  Future<APIEmptyResponse?> deleteEmailTemplateRenderError(String tenantId, String id, String errorId, ) async {
-    final response = await deleteEmailTemplateRenderErrorWithHttpInfo(tenantId, id, errorId, );
+  Future<APIEmptyResponse?> deleteEmailTemplateRenderError(String tenantId, String id, String errorId) async {
+    final response = await deleteEmailTemplateRenderErrorWithHttpInfo(tenantId, id, errorId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1706,7 +1706,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<Response> deleteHashTagWithHttpInfo(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId, ]) async {
+  Future<Response> deleteHashTagWithHttpInfo(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -1743,8 +1743,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<APIEmptyResponse?> deleteHashTag(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId, ]) async {
-    final response = await deleteHashTagWithHttpInfo(tag, deleteHashTagRequestBody, tenantId,);
+  Future<APIEmptyResponse?> deleteHashTag(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId ]) async {
+    final response = await deleteHashTagWithHttpInfo(tag, deleteHashTagRequestBody, tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1766,7 +1766,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<Response> deleteModeratorWithHttpInfo(String tenantId, String id, [ String? sendEmail, ]) async {
+  Future<Response> deleteModeratorWithHttpInfo(String tenantId, String id, [ String? sendEmail ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -1804,8 +1804,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sendEmail:
-  Future<APIEmptyResponse?> deleteModerator(String tenantId, String id, [ String? sendEmail, ]) async {
-    final response = await deleteModeratorWithHttpInfo(tenantId, id, sendEmail,);
+  Future<APIEmptyResponse?> deleteModerator(String tenantId, String id, [ String? sendEmail ]) async {
+    final response = await deleteModeratorWithHttpInfo(tenantId, id, sendEmail);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1825,7 +1825,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteNotificationCountWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deleteNotificationCountWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notification-count/{id}'
       .replaceAll('{id}', id);
@@ -1858,8 +1858,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteNotificationCount(String tenantId, String id, ) async {
-    final response = await deleteNotificationCountWithHttpInfo(tenantId, id, );
+  Future<APIEmptyResponse?> deleteNotificationCount(String tenantId, String id) async {
+    final response = await deleteNotificationCountWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1879,7 +1879,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deletePageWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deletePageWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/{id}'
       .replaceAll('{id}', id);
@@ -1912,8 +1912,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<DeletePageAPIResponse?> deletePage(String tenantId, String id, ) async {
-    final response = await deletePageWithHttpInfo(tenantId, id, );
+  Future<DeletePageAPIResponse?> deletePage(String tenantId, String id) async {
+    final response = await deletePageWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1933,7 +1933,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deletePendingWebhookEventWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deletePendingWebhookEventWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pending-webhook-events/{id}'
       .replaceAll('{id}', id);
@@ -1966,8 +1966,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deletePendingWebhookEvent(String tenantId, String id, ) async {
-    final response = await deletePendingWebhookEventWithHttpInfo(tenantId, id, );
+  Future<APIEmptyResponse?> deletePendingWebhookEvent(String tenantId, String id) async {
+    final response = await deletePendingWebhookEventWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1987,7 +1987,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteQuestionConfigWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deleteQuestionConfigWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -2020,8 +2020,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteQuestionConfig(String tenantId, String id, ) async {
-    final response = await deleteQuestionConfigWithHttpInfo(tenantId, id, );
+  Future<APIEmptyResponse?> deleteQuestionConfig(String tenantId, String id) async {
+    final response = await deleteQuestionConfigWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2041,7 +2041,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteQuestionResultWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deleteQuestionResultWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -2074,8 +2074,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteQuestionResult(String tenantId, String id, ) async {
-    final response = await deleteQuestionResultWithHttpInfo(tenantId, id, );
+  Future<APIEmptyResponse?> deleteQuestionResult(String tenantId, String id) async {
+    final response = await deleteQuestionResultWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2099,7 +2099,7 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteSSOUserWithHttpInfo(String tenantId, String id, [ ApiDeleteSSOUserOptions? options, ]) async {
+  Future<Response> deleteSSOUserWithHttpInfo(String tenantId, String id, [ ApiDeleteSSOUserOptions? options ]) async {
     final deleteComments = options?.deleteComments;
     final commentDeleteMode = options?.commentDeleteMode;
     // ignore: prefer_const_declarations
@@ -2144,8 +2144,8 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(String tenantId, String id, [ ApiDeleteSSOUserOptions? options, ]) async {
-    final response = await deleteSSOUserWithHttpInfo(tenantId, id, options,);
+  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(String tenantId, String id, [ ApiDeleteSSOUserOptions? options ]) async {
+    final response = await deleteSSOUserWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2167,7 +2167,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> deleteSubscriptionWithHttpInfo(String tenantId, String id, [ String? userId, ]) async {
+  Future<Response> deleteSubscriptionWithHttpInfo(String tenantId, String id, [ String? userId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -2205,8 +2205,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(String tenantId, String id, [ String? userId, ]) async {
-    final response = await deleteSubscriptionWithHttpInfo(tenantId, id, userId,);
+  Future<DeleteSubscriptionAPIResponse?> deleteSubscription(String tenantId, String id, [ String? userId ]) async {
+    final response = await deleteSubscriptionWithHttpInfo(tenantId, id, userId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2228,7 +2228,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<Response> deleteTenantWithHttpInfo(String tenantId, String id, [ String? sure, ]) async {
+  Future<Response> deleteTenantWithHttpInfo(String tenantId, String id, [ String? sure ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -2266,8 +2266,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] sure:
-  Future<APIEmptyResponse?> deleteTenant(String tenantId, String id, [ String? sure, ]) async {
-    final response = await deleteTenantWithHttpInfo(tenantId, id, sure,);
+  Future<APIEmptyResponse?> deleteTenant(String tenantId, String id, [ String? sure ]) async {
+    final response = await deleteTenantWithHttpInfo(tenantId, id, sure);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2287,7 +2287,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteTenantPackageWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deleteTenantPackageWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -2320,8 +2320,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptyResponse?> deleteTenantPackage(String tenantId, String id, ) async {
-    final response = await deleteTenantPackageWithHttpInfo(tenantId, id, );
+  Future<APIEmptyResponse?> deleteTenantPackage(String tenantId, String id) async {
+    final response = await deleteTenantPackageWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2345,7 +2345,7 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteTenantUserWithHttpInfo(String tenantId, String id, [ ApiDeleteTenantUserOptions? options, ]) async {
+  Future<Response> deleteTenantUserWithHttpInfo(String tenantId, String id, [ ApiDeleteTenantUserOptions? options ]) async {
     final deleteComments = options?.deleteComments;
     final commentDeleteMode = options?.commentDeleteMode;
     // ignore: prefer_const_declarations
@@ -2390,8 +2390,8 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<APIEmptyResponse?> deleteTenantUser(String tenantId, String id, [ ApiDeleteTenantUserOptions? options, ]) async {
-    final response = await deleteTenantUserWithHttpInfo(tenantId, id, options,);
+  Future<APIEmptyResponse?> deleteTenantUser(String tenantId, String id, [ ApiDeleteTenantUserOptions? options ]) async {
+    final response = await deleteTenantUserWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2411,7 +2411,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteUserBadgeWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> deleteUserBadgeWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -2444,8 +2444,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIEmptySuccessResponse?> deleteUserBadge(String tenantId, String id, ) async {
-    final response = await deleteUserBadgeWithHttpInfo(tenantId, id, );
+  Future<APIEmptySuccessResponse?> deleteUserBadge(String tenantId, String id) async {
+    final response = await deleteUserBadgeWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2467,7 +2467,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<Response> deleteVoteWithHttpInfo(String tenantId, String id, [ String? editKey, ]) async {
+  Future<Response> deleteVoteWithHttpInfo(String tenantId, String id, [ String? editKey ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes/{id}'
       .replaceAll('{id}', id);
@@ -2505,8 +2505,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] editKey:
-  Future<VoteDeleteResponse?> deleteVote(String tenantId, String id, [ String? editKey, ]) async {
-    final response = await deleteVoteWithHttpInfo(tenantId, id, editKey,);
+  Future<VoteDeleteResponse?> deleteVote(String tenantId, String id, [ String? editKey ]) async {
+    final response = await deleteVoteWithHttpInfo(tenantId, id, editKey);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2530,7 +2530,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> flagCommentWithHttpInfo(String tenantId, String id, [ ApiFlagCommentOptions? options, ]) async {
+  Future<Response> flagCommentWithHttpInfo(String tenantId, String id, [ ApiFlagCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -2575,8 +2575,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> flagComment(String tenantId, String id, [ ApiFlagCommentOptions? options, ]) async {
-    final response = await flagCommentWithHttpInfo(tenantId, id, options,);
+  Future<FlagCommentResponse?> flagComment(String tenantId, String id, [ ApiFlagCommentOptions? options ]) async {
+    final response = await flagCommentWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2604,7 +2604,7 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<Response> getAuditLogsWithHttpInfo(String tenantId, [ ApiGetAuditLogsOptions? options, ]) async {
+  Future<Response> getAuditLogsWithHttpInfo(String tenantId, [ ApiGetAuditLogsOptions? options ]) async {
     final limit = options?.limit;
     final skip = options?.skip;
     final order = options?.order;
@@ -2664,8 +2664,8 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<GetAuditLogsResponse?> getAuditLogs(String tenantId, [ ApiGetAuditLogsOptions? options, ]) async {
-    final response = await getAuditLogsWithHttpInfo(tenantId, options,);
+  Future<GetAuditLogsResponse?> getAuditLogs(String tenantId, [ ApiGetAuditLogsOptions? options ]) async {
+    final response = await getAuditLogsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2685,7 +2685,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getCachedNotificationCountWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getCachedNotificationCountWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notification-count/{id}'
       .replaceAll('{id}', id);
@@ -2718,8 +2718,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetCachedNotificationCountResponse?> getCachedNotificationCount(String tenantId, String id, ) async {
-    final response = await getCachedNotificationCountWithHttpInfo(tenantId, id, );
+  Future<GetCachedNotificationCountResponse?> getCachedNotificationCount(String tenantId, String id) async {
+    final response = await getCachedNotificationCountWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2739,7 +2739,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getCommentWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getCommentWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/comments/{id}'
       .replaceAll('{id}', id);
@@ -2772,8 +2772,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetCommentResponse?> getComment(String tenantId, String id, ) async {
-    final response = await getCommentWithHttpInfo(tenantId, id, );
+  Future<APIGetCommentResponse?> getComment(String tenantId, String id) async {
+    final response = await getCommentWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2823,7 +2823,7 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<Response> getCommentsWithHttpInfo(String tenantId, [ ApiGetCommentsOptions? options, ]) async {
+  Future<Response> getCommentsWithHttpInfo(String tenantId, [ ApiGetCommentsOptions? options ]) async {
     final page = options?.page;
     final limit = options?.limit;
     final skip = options?.skip;
@@ -2949,8 +2949,8 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<APIGetCommentsResponse?> getComments(String tenantId, [ ApiGetCommentsOptions? options, ]) async {
-    final response = await getCommentsWithHttpInfo(tenantId, options,);
+  Future<APIGetCommentsResponse?> getComments(String tenantId, [ ApiGetCommentsOptions? options ]) async {
+    final response = await getCommentsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2970,7 +2970,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<Response> getDomainConfigWithHttpInfo(String tenantId, String domain, ) async {
+  Future<Response> getDomainConfigWithHttpInfo(String tenantId, String domain) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domain}'
       .replaceAll('{domain}', domain);
@@ -3003,8 +3003,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] domain (required):
-  Future<GetDomainConfigResponse?> getDomainConfig(String tenantId, String domain, ) async {
-    final response = await getDomainConfigWithHttpInfo(tenantId, domain, );
+  Future<GetDomainConfigResponse?> getDomainConfig(String tenantId, String domain) async {
+    final response = await getDomainConfigWithHttpInfo(tenantId, domain);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3022,7 +3022,7 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getDomainConfigsWithHttpInfo(String tenantId, ) async {
+  Future<Response> getDomainConfigsWithHttpInfo(String tenantId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs';
 
@@ -3052,8 +3052,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetDomainConfigsResponse?> getDomainConfigs(String tenantId, ) async {
-    final response = await getDomainConfigsWithHttpInfo(tenantId, );
+  Future<GetDomainConfigsResponse?> getDomainConfigs(String tenantId) async {
+    final response = await getDomainConfigsWithHttpInfo(tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3073,7 +3073,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getEmailTemplateWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getEmailTemplateWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -3106,8 +3106,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetEmailTemplateResponse?> getEmailTemplate(String tenantId, String id, ) async {
-    final response = await getEmailTemplateWithHttpInfo(tenantId, id, );
+  Future<GetEmailTemplateResponse?> getEmailTemplate(String tenantId, String id) async {
+    final response = await getEmailTemplateWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3125,7 +3125,7 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getEmailTemplateDefinitionsWithHttpInfo(String tenantId, ) async {
+  Future<Response> getEmailTemplateDefinitionsWithHttpInfo(String tenantId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/definitions';
 
@@ -3155,8 +3155,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetEmailTemplateDefinitionsResponse?> getEmailTemplateDefinitions(String tenantId, ) async {
-    final response = await getEmailTemplateDefinitionsWithHttpInfo(tenantId, );
+  Future<GetEmailTemplateDefinitionsResponse?> getEmailTemplateDefinitions(String tenantId) async {
+    final response = await getEmailTemplateDefinitionsWithHttpInfo(tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3178,7 +3178,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(String tenantId, String id, [ double? skip, ]) async {
+  Future<Response> getEmailTemplateRenderErrorsWithHttpInfo(String tenantId, String id, [ double? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}/render-errors'
       .replaceAll('{id}', id);
@@ -3216,8 +3216,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(String tenantId, String id, [ double? skip, ]) async {
-    final response = await getEmailTemplateRenderErrorsWithHttpInfo(tenantId, id, skip,);
+  Future<GetEmailTemplateRenderErrorsResponse?> getEmailTemplateRenderErrors(String tenantId, String id, [ double? skip ]) async {
+    final response = await getEmailTemplateRenderErrorsWithHttpInfo(tenantId, id, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3237,7 +3237,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getEmailTemplatesWithHttpInfo(String tenantId, [ double? skip, ]) async {
+  Future<Response> getEmailTemplatesWithHttpInfo(String tenantId, [ double? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates';
 
@@ -3272,8 +3272,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetEmailTemplatesResponse?> getEmailTemplates(String tenantId, [ double? skip, ]) async {
-    final response = await getEmailTemplatesWithHttpInfo(tenantId, skip,);
+  Future<GetEmailTemplatesResponse?> getEmailTemplates(String tenantId, [ double? skip ]) async {
+    final response = await getEmailTemplatesWithHttpInfo(tenantId, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3300,7 +3300,7 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<Response> getFeedPostsWithHttpInfo(String tenantId, [ ApiGetFeedPostsOptions? options, ]) async {
+  Future<Response> getFeedPostsWithHttpInfo(String tenantId, [ ApiGetFeedPostsOptions? options ]) async {
     final afterId = options?.afterId;
     final limit = options?.limit;
     final tags = options?.tags;
@@ -3350,8 +3350,8 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<GetFeedPostsResponse?> getFeedPosts(String tenantId, [ ApiGetFeedPostsOptions? options, ]) async {
-    final response = await getFeedPostsWithHttpInfo(tenantId, options,);
+  Future<GetFeedPostsResponse?> getFeedPosts(String tenantId, [ ApiGetFeedPostsOptions? options ]) async {
+    final response = await getFeedPostsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3371,7 +3371,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<Response> getHashTagsWithHttpInfo(String tenantId, [ double? page, ]) async {
+  Future<Response> getHashTagsWithHttpInfo(String tenantId, [ double? page ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -3406,8 +3406,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] page:
-  Future<GetHashTagsResponse?> getHashTags(String tenantId, [ double? page, ]) async {
-    final response = await getHashTagsWithHttpInfo(tenantId, page,);
+  Future<GetHashTagsResponse?> getHashTags(String tenantId, [ double? page ]) async {
+    final response = await getHashTagsWithHttpInfo(tenantId, page);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3427,7 +3427,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getModeratorWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getModeratorWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -3460,8 +3460,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetModeratorResponse?> getModerator(String tenantId, String id, ) async {
-    final response = await getModeratorWithHttpInfo(tenantId, id, );
+  Future<GetModeratorResponse?> getModerator(String tenantId, String id) async {
+    final response = await getModeratorWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3481,7 +3481,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getModeratorsWithHttpInfo(String tenantId, [ double? skip, ]) async {
+  Future<Response> getModeratorsWithHttpInfo(String tenantId, [ double? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators';
 
@@ -3516,8 +3516,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetModeratorsResponse?> getModerators(String tenantId, [ double? skip, ]) async {
-    final response = await getModeratorsWithHttpInfo(tenantId, skip,);
+  Future<GetModeratorsResponse?> getModerators(String tenantId, [ double? skip ]) async {
+    final response = await getModeratorsWithHttpInfo(tenantId, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3545,7 +3545,7 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<Response> getNotificationCountWithHttpInfo(String tenantId, [ ApiGetNotificationCountOptions? options, ]) async {
+  Future<Response> getNotificationCountWithHttpInfo(String tenantId, [ ApiGetNotificationCountOptions? options ]) async {
     final userId = options?.userId;
     final urlId = options?.urlId;
     final fromCommentId = options?.fromCommentId;
@@ -3605,8 +3605,8 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<GetNotificationCountResponse?> getNotificationCount(String tenantId, [ ApiGetNotificationCountOptions? options, ]) async {
-    final response = await getNotificationCountWithHttpInfo(tenantId, options,);
+  Future<GetNotificationCountResponse?> getNotificationCount(String tenantId, [ ApiGetNotificationCountOptions? options ]) async {
+    final response = await getNotificationCountWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3636,7 +3636,7 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<Response> getNotificationsWithHttpInfo(String tenantId, [ ApiGetNotificationsOptions? options, ]) async {
+  Future<Response> getNotificationsWithHttpInfo(String tenantId, [ ApiGetNotificationsOptions? options ]) async {
     final userId = options?.userId;
     final urlId = options?.urlId;
     final fromCommentId = options?.fromCommentId;
@@ -3702,8 +3702,8 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<GetNotificationsResponse?> getNotifications(String tenantId, [ ApiGetNotificationsOptions? options, ]) async {
-    final response = await getNotificationsWithHttpInfo(tenantId, options,);
+  Future<GetNotificationsResponse?> getNotifications(String tenantId, [ ApiGetNotificationsOptions? options ]) async {
+    final response = await getNotificationsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3723,7 +3723,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getPageByURLIdWithHttpInfo(String tenantId, String urlId, ) async {
+  Future<Response> getPageByURLIdWithHttpInfo(String tenantId, String urlId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/by-url-id';
 
@@ -3756,8 +3756,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetPageByURLIdAPIResponse?> getPageByURLId(String tenantId, String urlId, ) async {
-    final response = await getPageByURLIdWithHttpInfo(tenantId, urlId, );
+  Future<GetPageByURLIdAPIResponse?> getPageByURLId(String tenantId, String urlId) async {
+    final response = await getPageByURLIdWithHttpInfo(tenantId, urlId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3775,7 +3775,7 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<Response> getPagesWithHttpInfo(String tenantId, ) async {
+  Future<Response> getPagesWithHttpInfo(String tenantId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages';
 
@@ -3805,8 +3805,8 @@ class DefaultApi {
   /// Parameters:
   ///
   /// * [String] tenantId (required):
-  Future<GetPagesAPIResponse?> getPages(String tenantId, ) async {
-    final response = await getPagesWithHttpInfo(tenantId, );
+  Future<GetPagesAPIResponse?> getPages(String tenantId) async {
+    final response = await getPagesWithHttpInfo(tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3836,7 +3836,7 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<Response> getPendingWebhookEventCountWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options, ]) async {
+  Future<Response> getPendingWebhookEventCountWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options ]) async {
     final commentId = options?.commentId;
     final externalId = options?.externalId;
     final eventType = options?.eventType;
@@ -3902,8 +3902,8 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options, ]) async {
-    final response = await getPendingWebhookEventCountWithHttpInfo(tenantId, options,);
+  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options ]) async {
+    final response = await getPendingWebhookEventCountWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3935,7 +3935,7 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<Response> getPendingWebhookEventsWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventsOptions? options, ]) async {
+  Future<Response> getPendingWebhookEventsWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventsOptions? options ]) async {
     final commentId = options?.commentId;
     final externalId = options?.externalId;
     final eventType = options?.eventType;
@@ -4007,8 +4007,8 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(String tenantId, [ ApiGetPendingWebhookEventsOptions? options, ]) async {
-    final response = await getPendingWebhookEventsWithHttpInfo(tenantId, options,);
+  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(String tenantId, [ ApiGetPendingWebhookEventsOptions? options ]) async {
+    final response = await getPendingWebhookEventsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4028,7 +4028,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getQuestionConfigWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getQuestionConfigWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -4061,8 +4061,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetQuestionConfigResponse?> getQuestionConfig(String tenantId, String id, ) async {
-    final response = await getQuestionConfigWithHttpInfo(tenantId, id, );
+  Future<GetQuestionConfigResponse?> getQuestionConfig(String tenantId, String id) async {
+    final response = await getQuestionConfigWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4082,7 +4082,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getQuestionConfigsWithHttpInfo(String tenantId, [ double? skip, ]) async {
+  Future<Response> getQuestionConfigsWithHttpInfo(String tenantId, [ double? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs';
 
@@ -4117,8 +4117,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetQuestionConfigsResponse?> getQuestionConfigs(String tenantId, [ double? skip, ]) async {
-    final response = await getQuestionConfigsWithHttpInfo(tenantId, skip,);
+  Future<GetQuestionConfigsResponse?> getQuestionConfigs(String tenantId, [ double? skip ]) async {
+    final response = await getQuestionConfigsWithHttpInfo(tenantId, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4138,7 +4138,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getQuestionResultWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getQuestionResultWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -4171,8 +4171,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetQuestionResultResponse?> getQuestionResult(String tenantId, String id, ) async {
-    final response = await getQuestionResultWithHttpInfo(tenantId, id, );
+  Future<GetQuestionResultResponse?> getQuestionResult(String tenantId, String id) async {
+    final response = await getQuestionResultWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4202,7 +4202,7 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<Response> getQuestionResultsWithHttpInfo(String tenantId, [ ApiGetQuestionResultsOptions? options, ]) async {
+  Future<Response> getQuestionResultsWithHttpInfo(String tenantId, [ ApiGetQuestionResultsOptions? options ]) async {
     final urlId = options?.urlId;
     final userId = options?.userId;
     final startDate = options?.startDate;
@@ -4268,8 +4268,8 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<GetQuestionResultsResponse?> getQuestionResults(String tenantId, [ ApiGetQuestionResultsOptions? options, ]) async {
-    final response = await getQuestionResultsWithHttpInfo(tenantId, options,);
+  Future<GetQuestionResultsResponse?> getQuestionResults(String tenantId, [ ApiGetQuestionResultsOptions? options ]) async {
+    final response = await getQuestionResultsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4289,7 +4289,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] email (required):
-  Future<Response> getSSOUserByEmailWithHttpInfo(String tenantId, String email, ) async {
+  Future<Response> getSSOUserByEmailWithHttpInfo(String tenantId, String email) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/by-email/{email}'
       .replaceAll('{email}', email);
@@ -4322,8 +4322,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] email (required):
-  Future<GetSSOUserByEmailAPIResponse?> getSSOUserByEmail(String tenantId, String email, ) async {
-    final response = await getSSOUserByEmailWithHttpInfo(tenantId, email, );
+  Future<GetSSOUserByEmailAPIResponse?> getSSOUserByEmail(String tenantId, String email) async {
+    final response = await getSSOUserByEmailWithHttpInfo(tenantId, email);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4343,7 +4343,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getSSOUserByIdWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getSSOUserByIdWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/by-id/{id}'
       .replaceAll('{id}', id);
@@ -4376,8 +4376,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetSSOUserByIdAPIResponse?> getSSOUserById(String tenantId, String id, ) async {
-    final response = await getSSOUserByIdWithHttpInfo(tenantId, id, );
+  Future<GetSSOUserByIdAPIResponse?> getSSOUserById(String tenantId, String id) async {
+    final response = await getSSOUserByIdWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4397,7 +4397,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<Response> getSSOUsersWithHttpInfo(String tenantId, [ int? skip, ]) async {
+  Future<Response> getSSOUsersWithHttpInfo(String tenantId, [ int? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users';
 
@@ -4432,8 +4432,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [int] skip:
-  Future<GetSSOUsersResponse?> getSSOUsers(String tenantId, [ int? skip, ]) async {
-    final response = await getSSOUsersWithHttpInfo(tenantId, skip,);
+  Future<GetSSOUsersResponse?> getSSOUsers(String tenantId, [ int? skip ]) async {
+    final response = await getSSOUsersWithHttpInfo(tenantId, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4453,7 +4453,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<Response> getSubscriptionsWithHttpInfo(String tenantId, [ String? userId, ]) async {
+  Future<Response> getSubscriptionsWithHttpInfo(String tenantId, [ String? userId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions';
 
@@ -4488,8 +4488,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId:
-  Future<GetSubscriptionsAPIResponse?> getSubscriptions(String tenantId, [ String? userId, ]) async {
-    final response = await getSubscriptionsWithHttpInfo(tenantId, userId,);
+  Future<GetSubscriptionsAPIResponse?> getSubscriptions(String tenantId, [ String? userId ]) async {
+    final response = await getSubscriptionsWithHttpInfo(tenantId, userId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4509,7 +4509,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getTenantWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -4542,8 +4542,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantResponse?> getTenant(String tenantId, String id, ) async {
-    final response = await getTenantWithHttpInfo(tenantId, id, );
+  Future<GetTenantResponse?> getTenant(String tenantId, String id) async {
+    final response = await getTenantWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4569,7 +4569,7 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<Response> getTenantDailyUsagesWithHttpInfo(String tenantId, [ ApiGetTenantDailyUsagesOptions? options, ]) async {
+  Future<Response> getTenantDailyUsagesWithHttpInfo(String tenantId, [ ApiGetTenantDailyUsagesOptions? options ]) async {
     final yearNumber = options?.yearNumber;
     final monthNumber = options?.monthNumber;
     final dayNumber = options?.dayNumber;
@@ -4623,8 +4623,8 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(String tenantId, [ ApiGetTenantDailyUsagesOptions? options, ]) async {
-    final response = await getTenantDailyUsagesWithHttpInfo(tenantId, options,);
+  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(String tenantId, [ ApiGetTenantDailyUsagesOptions? options ]) async {
+    final response = await getTenantDailyUsagesWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4644,7 +4644,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantPackageWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getTenantPackageWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -4677,8 +4677,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantPackageResponse?> getTenantPackage(String tenantId, String id, ) async {
-    final response = await getTenantPackageWithHttpInfo(tenantId, id, );
+  Future<GetTenantPackageResponse?> getTenantPackage(String tenantId, String id) async {
+    final response = await getTenantPackageWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4698,7 +4698,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantPackagesWithHttpInfo(String tenantId, [ double? skip, ]) async {
+  Future<Response> getTenantPackagesWithHttpInfo(String tenantId, [ double? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages';
 
@@ -4733,8 +4733,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantPackagesResponse?> getTenantPackages(String tenantId, [ double? skip, ]) async {
-    final response = await getTenantPackagesWithHttpInfo(tenantId, skip,);
+  Future<GetTenantPackagesResponse?> getTenantPackages(String tenantId, [ double? skip ]) async {
+    final response = await getTenantPackagesWithHttpInfo(tenantId, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4754,7 +4754,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getTenantUserWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getTenantUserWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -4787,8 +4787,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetTenantUserResponse?> getTenantUser(String tenantId, String id, ) async {
-    final response = await getTenantUserWithHttpInfo(tenantId, id, );
+  Future<GetTenantUserResponse?> getTenantUser(String tenantId, String id) async {
+    final response = await getTenantUserWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4808,7 +4808,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<Response> getTenantUsersWithHttpInfo(String tenantId, [ double? skip, ]) async {
+  Future<Response> getTenantUsersWithHttpInfo(String tenantId, [ double? skip ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users';
 
@@ -4843,8 +4843,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [double] skip:
-  Future<GetTenantUsersResponse?> getTenantUsers(String tenantId, [ double? skip, ]) async {
-    final response = await getTenantUsersWithHttpInfo(tenantId, skip,);
+  Future<GetTenantUsersResponse?> getTenantUsers(String tenantId, [ double? skip ]) async {
+    final response = await getTenantUsersWithHttpInfo(tenantId, skip);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4866,7 +4866,7 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<Response> getTenantsWithHttpInfo(String tenantId, [ ApiGetTenantsOptions? options, ]) async {
+  Future<Response> getTenantsWithHttpInfo(String tenantId, [ ApiGetTenantsOptions? options ]) async {
     final meta = options?.meta;
     final skip = options?.skip;
     // ignore: prefer_const_declarations
@@ -4908,8 +4908,8 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<GetTenantsResponse?> getTenants(String tenantId, [ ApiGetTenantsOptions? options, ]) async {
-    final response = await getTenantsWithHttpInfo(tenantId, options,);
+  Future<GetTenantsResponse?> getTenants(String tenantId, [ ApiGetTenantsOptions? options ]) async {
+    final response = await getTenantsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4931,7 +4931,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<Response> getTicketWithHttpInfo(String tenantId, String id, [ String? userId, ]) async {
+  Future<Response> getTicketWithHttpInfo(String tenantId, String id, [ String? userId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tickets/{id}'
       .replaceAll('{id}', id);
@@ -4969,8 +4969,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] userId:
-  Future<GetTicketResponse?> getTicket(String tenantId, String id, [ String? userId, ]) async {
-    final response = await getTicketWithHttpInfo(tenantId, id, userId,);
+  Future<GetTicketResponse?> getTicket(String tenantId, String id, [ String? userId ]) async {
+    final response = await getTicketWithHttpInfo(tenantId, id, userId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -4996,7 +4996,7 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<Response> getTicketsWithHttpInfo(String tenantId, [ ApiGetTicketsOptions? options, ]) async {
+  Future<Response> getTicketsWithHttpInfo(String tenantId, [ ApiGetTicketsOptions? options ]) async {
     final userId = options?.userId;
     final state = options?.state;
     final skip = options?.skip;
@@ -5050,8 +5050,8 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<GetTicketsResponse?> getTickets(String tenantId, [ ApiGetTicketsOptions? options, ]) async {
-    final response = await getTicketsWithHttpInfo(tenantId, options,);
+  Future<GetTicketsResponse?> getTickets(String tenantId, [ ApiGetTicketsOptions? options ]) async {
+    final response = await getTicketsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5071,7 +5071,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getUserWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/users/{id}'
       .replaceAll('{id}', id);
@@ -5104,8 +5104,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<GetUserResponse?> getUser(String tenantId, String id, ) async {
-    final response = await getUserWithHttpInfo(tenantId, id, );
+  Future<GetUserResponse?> getUser(String tenantId, String id) async {
+    final response = await getUserWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5125,7 +5125,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserBadgeWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getUserBadgeWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -5158,8 +5158,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetUserBadgeResponse?> getUserBadge(String tenantId, String id, ) async {
-    final response = await getUserBadgeWithHttpInfo(tenantId, id, );
+  Future<APIGetUserBadgeResponse?> getUserBadge(String tenantId, String id) async {
+    final response = await getUserBadgeWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5179,7 +5179,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getUserBadgeProgressByIdWithHttpInfo(String tenantId, String id, ) async {
+  Future<Response> getUserBadgeProgressByIdWithHttpInfo(String tenantId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress/{id}'
       .replaceAll('{id}', id);
@@ -5212,8 +5212,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] id (required):
-  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressById(String tenantId, String id, ) async {
-    final response = await getUserBadgeProgressByIdWithHttpInfo(tenantId, id, );
+  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressById(String tenantId, String id) async {
+    final response = await getUserBadgeProgressByIdWithHttpInfo(tenantId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5233,7 +5233,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId (required):
-  Future<Response> getUserBadgeProgressByUserIdWithHttpInfo(String tenantId, String userId, ) async {
+  Future<Response> getUserBadgeProgressByUserIdWithHttpInfo(String tenantId, String userId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badge-progress/user/{userId}'
       .replaceAll('{userId}', userId);
@@ -5266,8 +5266,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] userId (required):
-  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressByUserId(String tenantId, String userId, ) async {
-    final response = await getUserBadgeProgressByUserIdWithHttpInfo(tenantId, userId, );
+  Future<APIGetUserBadgeProgressResponse?> getUserBadgeProgressByUserId(String tenantId, String userId) async {
+    final response = await getUserBadgeProgressByUserIdWithHttpInfo(tenantId, userId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5291,7 +5291,7 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgeProgressListWithHttpInfo(String tenantId, [ ApiGetUserBadgeProgressListOptions? options, ]) async {
+  Future<Response> getUserBadgeProgressListWithHttpInfo(String tenantId, [ ApiGetUserBadgeProgressListOptions? options ]) async {
     final userId = options?.userId;
     final limit = options?.limit;
     final skip = options?.skip;
@@ -5339,8 +5339,8 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(String tenantId, [ ApiGetUserBadgeProgressListOptions? options, ]) async {
-    final response = await getUserBadgeProgressListWithHttpInfo(tenantId, options,);
+  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(String tenantId, [ ApiGetUserBadgeProgressListOptions? options ]) async {
+    final response = await getUserBadgeProgressListWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5370,7 +5370,7 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgesWithHttpInfo(String tenantId, [ ApiGetUserBadgesOptions? options, ]) async {
+  Future<Response> getUserBadgesWithHttpInfo(String tenantId, [ ApiGetUserBadgesOptions? options ]) async {
     final userId = options?.userId;
     final badgeId = options?.badgeId;
     final type = options?.type;
@@ -5436,8 +5436,8 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgesResponse?> getUserBadges(String tenantId, [ ApiGetUserBadgesOptions? options, ]) async {
-    final response = await getUserBadgesWithHttpInfo(tenantId, options,);
+  Future<APIGetUserBadgesResponse?> getUserBadges(String tenantId, [ ApiGetUserBadgesOptions? options ]) async {
+    final response = await getUserBadgesWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5457,7 +5457,7 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getVotesWithHttpInfo(String tenantId, String urlId, ) async {
+  Future<Response> getVotesWithHttpInfo(String tenantId, String urlId) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/votes';
 
@@ -5490,8 +5490,8 @@ class DefaultApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetVotesResponse?> getVotes(String tenantId, String urlId, ) async {
-    final response = await getVotesWithHttpInfo(tenantId, urlId, );
+  Future<GetVotesResponse?> getVotes(String tenantId, String urlId) async {
+    final response = await getVotesWithHttpInfo(tenantId, urlId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5515,7 +5515,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> getVotesForUserWithHttpInfo(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options, ]) async {
+  Future<Response> getVotesForUserWithHttpInfo(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -5560,8 +5560,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<GetVotesForUserResponse?> getVotesForUser(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options, ]) async {
-    final response = await getVotesForUserWithHttpInfo(tenantId, urlId, options,);
+  Future<GetVotesForUserResponse?> getVotesForUser(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options ]) async {
+    final response = await getVotesForUserWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5583,7 +5583,7 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [PatchDomainConfigParams] patchDomainConfigParams (required):
-  Future<Response> patchDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams, ) async {
+  Future<Response> patchDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domainToUpdate}'
       .replaceAll('{domainToUpdate}', domainToUpdate);
@@ -5618,8 +5618,8 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [PatchDomainConfigParams] patchDomainConfigParams (required):
-  Future<PatchDomainConfigResponse?> patchDomainConfig(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams, ) async {
-    final response = await patchDomainConfigWithHttpInfo(tenantId, domainToUpdate, patchDomainConfigParams, );
+  Future<PatchDomainConfigResponse?> patchDomainConfig(String tenantId, String domainToUpdate, PatchDomainConfigParams patchDomainConfigParams) async {
+    final response = await patchDomainConfigWithHttpInfo(tenantId, domainToUpdate, patchDomainConfigParams);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5641,7 +5641,7 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<Response> patchHashTagWithHttpInfo(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId, ]) async {
+  Future<Response> patchHashTagWithHttpInfo(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -5678,8 +5678,8 @@ class DefaultApi {
   /// * [String] tenantId:
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<UpdateHashTagResponse?> patchHashTag(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId, ]) async {
-    final response = await patchHashTagWithHttpInfo(tag, updateHashTagBody, tenantId,);
+  Future<UpdateHashTagResponse?> patchHashTag(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId ]) async {
+    final response = await patchHashTagWithHttpInfo(tag, updateHashTagBody, tenantId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5701,7 +5701,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateAPIPageData] updateAPIPageData (required):
-  Future<Response> patchPageWithHttpInfo(String tenantId, String id, UpdateAPIPageData updateAPIPageData, ) async {
+  Future<Response> patchPageWithHttpInfo(String tenantId, String id, UpdateAPIPageData updateAPIPageData) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/pages/{id}'
       .replaceAll('{id}', id);
@@ -5736,8 +5736,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateAPIPageData] updateAPIPageData (required):
-  Future<PatchPageAPIResponse?> patchPage(String tenantId, String id, UpdateAPIPageData updateAPIPageData, ) async {
-    final response = await patchPageWithHttpInfo(tenantId, id, updateAPIPageData, );
+  Future<PatchPageAPIResponse?> patchPage(String tenantId, String id, UpdateAPIPageData updateAPIPageData) async {
+    final response = await patchPageWithHttpInfo(tenantId, id, updateAPIPageData);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5761,7 +5761,7 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> patchSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
+  Future<Response> patchSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5801,8 +5801,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PatchSSOUserAPIResponse?> patchSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
-    final response = await patchSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, updateComments,);
+  Future<PatchSSOUserAPIResponse?> patchSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments ]) async {
+    final response = await patchSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, updateComments);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5824,7 +5824,7 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [UpdateDomainConfigParams] updateDomainConfigParams (required):
-  Future<Response> putDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams, ) async {
+  Future<Response> putDomainConfigWithHttpInfo(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/domain-configs/{domainToUpdate}'
       .replaceAll('{domainToUpdate}', domainToUpdate);
@@ -5859,8 +5859,8 @@ class DefaultApi {
   /// * [String] domainToUpdate (required):
   ///
   /// * [UpdateDomainConfigParams] updateDomainConfigParams (required):
-  Future<PutDomainConfigResponse?> putDomainConfig(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams, ) async {
-    final response = await putDomainConfigWithHttpInfo(tenantId, domainToUpdate, updateDomainConfigParams, );
+  Future<PutDomainConfigResponse?> putDomainConfig(String tenantId, String domainToUpdate, UpdateDomainConfigParams updateDomainConfigParams) async {
+    final response = await putDomainConfigWithHttpInfo(tenantId, domainToUpdate, updateDomainConfigParams);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5884,7 +5884,7 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<Response> putSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
+  Future<Response> putSSOUserWithHttpInfo(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/sso-users/{id}'
       .replaceAll('{id}', id);
@@ -5924,8 +5924,8 @@ class DefaultApi {
   /// * [UpdateAPISSOUserData] updateAPISSOUserData (required):
   ///
   /// * [bool] updateComments:
-  Future<PutSSOUserAPIResponse?> putSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments, ]) async {
-    final response = await putSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, updateComments,);
+  Future<PutSSOUserAPIResponse?> putSSOUser(String tenantId, String id, UpdateAPISSOUserData updateAPISSOUserData, [ bool? updateComments ]) async {
+    final response = await putSSOUserWithHttpInfo(tenantId, id, updateAPISSOUserData, updateComments);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -5947,7 +5947,7 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<Response> renderEmailTemplateWithHttpInfo(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ String? locale, ]) async {
+  Future<Response> renderEmailTemplateWithHttpInfo(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ String? locale ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/render';
 
@@ -5984,8 +5984,8 @@ class DefaultApi {
   /// * [RenderEmailTemplateBody] renderEmailTemplateBody (required):
   ///
   /// * [String] locale:
-  Future<RenderEmailTemplateResponse?> renderEmailTemplate(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ String? locale, ]) async {
-    final response = await renderEmailTemplateWithHttpInfo(tenantId, renderEmailTemplateBody, locale,);
+  Future<RenderEmailTemplateResponse?> renderEmailTemplate(String tenantId, RenderEmailTemplateBody renderEmailTemplateBody, [ String? locale ]) async {
+    final response = await renderEmailTemplateWithHttpInfo(tenantId, renderEmailTemplateBody, locale);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6007,7 +6007,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ReplaceTenantPackageBody] replaceTenantPackageBody (required):
-  Future<Response> replaceTenantPackageWithHttpInfo(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody, ) async {
+  Future<Response> replaceTenantPackageWithHttpInfo(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -6042,8 +6042,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [ReplaceTenantPackageBody] replaceTenantPackageBody (required):
-  Future<APIEmptyResponse?> replaceTenantPackage(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody, ) async {
-    final response = await replaceTenantPackageWithHttpInfo(tenantId, id, replaceTenantPackageBody, );
+  Future<APIEmptyResponse?> replaceTenantPackage(String tenantId, String id, ReplaceTenantPackageBody replaceTenantPackageBody) async {
+    final response = await replaceTenantPackageWithHttpInfo(tenantId, id, replaceTenantPackageBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6067,7 +6067,7 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> replaceTenantUserWithHttpInfo(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ String? updateComments, ]) async {
+  Future<Response> replaceTenantUserWithHttpInfo(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ String? updateComments ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -6107,8 +6107,8 @@ class DefaultApi {
   /// * [ReplaceTenantUserBody] replaceTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> replaceTenantUser(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ String? updateComments, ]) async {
-    final response = await replaceTenantUserWithHttpInfo(tenantId, id, replaceTenantUserBody, updateComments,);
+  Future<APIEmptyResponse?> replaceTenantUser(String tenantId, String id, ReplaceTenantUserBody replaceTenantUserBody, [ String? updateComments ]) async {
+    final response = await replaceTenantUserWithHttpInfo(tenantId, id, replaceTenantUserBody, updateComments);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6136,7 +6136,7 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentWithHttpInfo(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options, ]) async {
+  Future<Response> saveCommentWithHttpInfo(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options ]) async {
     final isLive = options?.isLive;
     final doSpamCheck = options?.doSpamCheck;
     final sendEmails = options?.sendEmails;
@@ -6192,8 +6192,8 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<APISaveCommentResponse?> saveComment(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options, ]) async {
-    final response = await saveCommentWithHttpInfo(tenantId, createCommentParams, options,);
+  Future<APISaveCommentResponse?> saveComment(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options ]) async {
+    final response = await saveCommentWithHttpInfo(tenantId, createCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6221,7 +6221,7 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentsBulkWithHttpInfo(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options, ]) async {
+  Future<Response> saveCommentsBulkWithHttpInfo(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options ]) async {
     final isLive = options?.isLive;
     final doSpamCheck = options?.doSpamCheck;
     final sendEmails = options?.sendEmails;
@@ -6277,8 +6277,8 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options, ]) async {
-    final response = await saveCommentsBulkWithHttpInfo(tenantId, createCommentParams, options,);
+  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options ]) async {
+    final response = await saveCommentsBulkWithHttpInfo(tenantId, createCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6303,7 +6303,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] fromName (required):
-  Future<Response> sendInviteWithHttpInfo(String tenantId, String id, String fromName, ) async {
+  Future<Response> sendInviteWithHttpInfo(String tenantId, String id, String fromName) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}/send-invite'
       .replaceAll('{id}', id);
@@ -6339,8 +6339,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] fromName (required):
-  Future<APIEmptyResponse?> sendInvite(String tenantId, String id, String fromName, ) async {
-    final response = await sendInviteWithHttpInfo(tenantId, id, fromName, );
+  Future<APIEmptyResponse?> sendInvite(String tenantId, String id, String fromName) async {
+    final response = await sendInviteWithHttpInfo(tenantId, id, fromName);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6362,7 +6362,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<Response> sendLoginLinkWithHttpInfo(String tenantId, String id, [ String? redirectURL, ]) async {
+  Future<Response> sendLoginLinkWithHttpInfo(String tenantId, String id, [ String? redirectURL ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}/send-login-link'
       .replaceAll('{id}', id);
@@ -6400,8 +6400,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [String] redirectURL:
-  Future<APIEmptyResponse?> sendLoginLink(String tenantId, String id, [ String? redirectURL, ]) async {
-    final response = await sendLoginLinkWithHttpInfo(tenantId, id, redirectURL,);
+  Future<APIEmptyResponse?> sendLoginLink(String tenantId, String id, [ String? redirectURL ]) async {
+    final response = await sendLoginLinkWithHttpInfo(tenantId, id, redirectURL);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6427,7 +6427,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unBlockUserFromCommentWithHttpInfo(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options, ]) async {
+  Future<Response> unBlockUserFromCommentWithHttpInfo(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -6474,8 +6474,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<UnblockSuccess?> unBlockUserFromComment(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options, ]) async {
-    final response = await unBlockUserFromCommentWithHttpInfo(tenantId, id, unBlockFromCommentParams, options,);
+  Future<UnblockSuccess?> unBlockUserFromComment(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options ]) async {
+    final response = await unBlockUserFromCommentWithHttpInfo(tenantId, id, unBlockFromCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6499,7 +6499,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unFlagCommentWithHttpInfo(String tenantId, String id, [ ApiUnFlagCommentOptions? options, ]) async {
+  Future<Response> unFlagCommentWithHttpInfo(String tenantId, String id, [ ApiUnFlagCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -6544,8 +6544,8 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> unFlagComment(String tenantId, String id, [ ApiUnFlagCommentOptions? options, ]) async {
-    final response = await unFlagCommentWithHttpInfo(tenantId, id, options,);
+  Future<FlagCommentResponse?> unFlagComment(String tenantId, String id, [ ApiUnFlagCommentOptions? options ]) async {
+    final response = await unFlagCommentWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6573,7 +6573,7 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<Response> updateCommentWithHttpInfo(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options, ]) async {
+  Future<Response> updateCommentWithHttpInfo(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options ]) async {
     final contextUserId = options?.contextUserId;
     final doSpamCheck = options?.doSpamCheck;
     final isLive = options?.isLive;
@@ -6626,8 +6626,8 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<APIEmptyResponse?> updateComment(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options, ]) async {
-    final response = await updateCommentWithHttpInfo(tenantId, id, updatableCommentParams, options,);
+  Future<APIEmptyResponse?> updateComment(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options ]) async {
+    final response = await updateCommentWithHttpInfo(tenantId, id, updatableCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6649,7 +6649,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateEmailTemplateBody] updateEmailTemplateBody (required):
-  Future<Response> updateEmailTemplateWithHttpInfo(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody, ) async {
+  Future<Response> updateEmailTemplateWithHttpInfo(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/email-templates/{id}'
       .replaceAll('{id}', id);
@@ -6684,8 +6684,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateEmailTemplateBody] updateEmailTemplateBody (required):
-  Future<APIEmptyResponse?> updateEmailTemplate(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody, ) async {
-    final response = await updateEmailTemplateWithHttpInfo(tenantId, id, updateEmailTemplateBody, );
+  Future<APIEmptyResponse?> updateEmailTemplate(String tenantId, String id, UpdateEmailTemplateBody updateEmailTemplateBody) async {
+    final response = await updateEmailTemplateWithHttpInfo(tenantId, id, updateEmailTemplateBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6707,7 +6707,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [FeedPost] feedPost (required):
-  Future<Response> updateFeedPostWithHttpInfo(String tenantId, String id, FeedPost feedPost, ) async {
+  Future<Response> updateFeedPostWithHttpInfo(String tenantId, String id, FeedPost feedPost) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/feed-posts/{id}'
       .replaceAll('{id}', id);
@@ -6742,8 +6742,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [FeedPost] feedPost (required):
-  Future<APIEmptyResponse?> updateFeedPost(String tenantId, String id, FeedPost feedPost, ) async {
-    final response = await updateFeedPostWithHttpInfo(tenantId, id, feedPost, );
+  Future<APIEmptyResponse?> updateFeedPost(String tenantId, String id, FeedPost feedPost) async {
+    final response = await updateFeedPostWithHttpInfo(tenantId, id, feedPost);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6765,7 +6765,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateModeratorBody] updateModeratorBody (required):
-  Future<Response> updateModeratorWithHttpInfo(String tenantId, String id, UpdateModeratorBody updateModeratorBody, ) async {
+  Future<Response> updateModeratorWithHttpInfo(String tenantId, String id, UpdateModeratorBody updateModeratorBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/moderators/{id}'
       .replaceAll('{id}', id);
@@ -6800,8 +6800,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateModeratorBody] updateModeratorBody (required):
-  Future<APIEmptyResponse?> updateModerator(String tenantId, String id, UpdateModeratorBody updateModeratorBody, ) async {
-    final response = await updateModeratorWithHttpInfo(tenantId, id, updateModeratorBody, );
+  Future<APIEmptyResponse?> updateModerator(String tenantId, String id, UpdateModeratorBody updateModeratorBody) async {
+    final response = await updateModeratorWithHttpInfo(tenantId, id, updateModeratorBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6825,7 +6825,7 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<Response> updateNotificationWithHttpInfo(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ String? userId, ]) async {
+  Future<Response> updateNotificationWithHttpInfo(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ String? userId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/notifications/{id}'
       .replaceAll('{id}', id);
@@ -6865,8 +6865,8 @@ class DefaultApi {
   /// * [UpdateNotificationBody] updateNotificationBody (required):
   ///
   /// * [String] userId:
-  Future<APIEmptyResponse?> updateNotification(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ String? userId, ]) async {
-    final response = await updateNotificationWithHttpInfo(tenantId, id, updateNotificationBody, userId,);
+  Future<APIEmptyResponse?> updateNotification(String tenantId, String id, UpdateNotificationBody updateNotificationBody, [ String? userId ]) async {
+    final response = await updateNotificationWithHttpInfo(tenantId, id, updateNotificationBody, userId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6888,7 +6888,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionConfigBody] updateQuestionConfigBody (required):
-  Future<Response> updateQuestionConfigWithHttpInfo(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody, ) async {
+  Future<Response> updateQuestionConfigWithHttpInfo(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-configs/{id}'
       .replaceAll('{id}', id);
@@ -6923,8 +6923,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionConfigBody] updateQuestionConfigBody (required):
-  Future<APIEmptyResponse?> updateQuestionConfig(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody, ) async {
-    final response = await updateQuestionConfigWithHttpInfo(tenantId, id, updateQuestionConfigBody, );
+  Future<APIEmptyResponse?> updateQuestionConfig(String tenantId, String id, UpdateQuestionConfigBody updateQuestionConfigBody) async {
+    final response = await updateQuestionConfigWithHttpInfo(tenantId, id, updateQuestionConfigBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6946,7 +6946,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionResultBody] updateQuestionResultBody (required):
-  Future<Response> updateQuestionResultWithHttpInfo(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody, ) async {
+  Future<Response> updateQuestionResultWithHttpInfo(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/question-results/{id}'
       .replaceAll('{id}', id);
@@ -6981,8 +6981,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateQuestionResultBody] updateQuestionResultBody (required):
-  Future<APIEmptyResponse?> updateQuestionResult(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody, ) async {
-    final response = await updateQuestionResultWithHttpInfo(tenantId, id, updateQuestionResultBody, );
+  Future<APIEmptyResponse?> updateQuestionResult(String tenantId, String id, UpdateQuestionResultBody updateQuestionResultBody) async {
+    final response = await updateQuestionResultWithHttpInfo(tenantId, id, updateQuestionResultBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7006,7 +7006,7 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<Response> updateSubscriptionWithHttpInfo(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ String? userId, ]) async {
+  Future<Response> updateSubscriptionWithHttpInfo(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ String? userId ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/subscriptions/{id}'
       .replaceAll('{id}', id);
@@ -7046,8 +7046,8 @@ class DefaultApi {
   /// * [UpdateAPIUserSubscriptionData] updateAPIUserSubscriptionData (required):
   ///
   /// * [String] userId:
-  Future<UpdateSubscriptionAPIResponse?> updateSubscription(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ String? userId, ]) async {
-    final response = await updateSubscriptionWithHttpInfo(tenantId, id, updateAPIUserSubscriptionData, userId,);
+  Future<UpdateSubscriptionAPIResponse?> updateSubscription(String tenantId, String id, UpdateAPIUserSubscriptionData updateAPIUserSubscriptionData, [ String? userId ]) async {
+    final response = await updateSubscriptionWithHttpInfo(tenantId, id, updateAPIUserSubscriptionData, userId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7069,7 +7069,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantBody] updateTenantBody (required):
-  Future<Response> updateTenantWithHttpInfo(String tenantId, String id, UpdateTenantBody updateTenantBody, ) async {
+  Future<Response> updateTenantWithHttpInfo(String tenantId, String id, UpdateTenantBody updateTenantBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenants/{id}'
       .replaceAll('{id}', id);
@@ -7104,8 +7104,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantBody] updateTenantBody (required):
-  Future<APIEmptyResponse?> updateTenant(String tenantId, String id, UpdateTenantBody updateTenantBody, ) async {
-    final response = await updateTenantWithHttpInfo(tenantId, id, updateTenantBody, );
+  Future<APIEmptyResponse?> updateTenant(String tenantId, String id, UpdateTenantBody updateTenantBody) async {
+    final response = await updateTenantWithHttpInfo(tenantId, id, updateTenantBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7127,7 +7127,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantPackageBody] updateTenantPackageBody (required):
-  Future<Response> updateTenantPackageWithHttpInfo(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody, ) async {
+  Future<Response> updateTenantPackageWithHttpInfo(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-packages/{id}'
       .replaceAll('{id}', id);
@@ -7162,8 +7162,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateTenantPackageBody] updateTenantPackageBody (required):
-  Future<APIEmptyResponse?> updateTenantPackage(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody, ) async {
-    final response = await updateTenantPackageWithHttpInfo(tenantId, id, updateTenantPackageBody, );
+  Future<APIEmptyResponse?> updateTenantPackage(String tenantId, String id, UpdateTenantPackageBody updateTenantPackageBody) async {
+    final response = await updateTenantPackageWithHttpInfo(tenantId, id, updateTenantPackageBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7187,7 +7187,7 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<Response> updateTenantUserWithHttpInfo(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ String? updateComments, ]) async {
+  Future<Response> updateTenantUserWithHttpInfo(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ String? updateComments ]) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/tenant-users/{id}'
       .replaceAll('{id}', id);
@@ -7227,8 +7227,8 @@ class DefaultApi {
   /// * [UpdateTenantUserBody] updateTenantUserBody (required):
   ///
   /// * [String] updateComments:
-  Future<APIEmptyResponse?> updateTenantUser(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ String? updateComments, ]) async {
-    final response = await updateTenantUserWithHttpInfo(tenantId, id, updateTenantUserBody, updateComments,);
+  Future<APIEmptyResponse?> updateTenantUser(String tenantId, String id, UpdateTenantUserBody updateTenantUserBody, [ String? updateComments ]) async {
+    final response = await updateTenantUserWithHttpInfo(tenantId, id, updateTenantUserBody, updateComments);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -7250,7 +7250,7 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateUserBadgeParams] updateUserBadgeParams (required):
-  Future<Response> updateUserBadgeWithHttpInfo(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams, ) async {
+  Future<Response> updateUserBadgeWithHttpInfo(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/user-badges/{id}'
       .replaceAll('{id}', id);
@@ -7285,8 +7285,8 @@ class DefaultApi {
   /// * [String] id (required):
   ///
   /// * [UpdateUserBadgeParams] updateUserBadgeParams (required):
-  Future<APIEmptySuccessResponse?> updateUserBadge(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams, ) async {
-    final response = await updateUserBadgeWithHttpInfo(tenantId, id, updateUserBadgeParams, );
+  Future<APIEmptySuccessResponse?> updateUserBadge(String tenantId, String id, UpdateUserBadgeParams updateUserBadgeParams) async {
+    final response = await updateUserBadgeWithHttpInfo(tenantId, id, updateUserBadgeParams);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
diff --git a/client/lib/api/moderation_api.dart b/client/lib/api/moderation_api.dart
index d85c95e..5944501 100644
--- a/client/lib/api/moderation_api.dart
+++ b/client/lib/api/moderation_api.dart
@@ -28,7 +28,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options, ]) async {
+  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -79,8 +79,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options, ]) async {
-    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId, options,);
+  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options ]) async {
+    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -116,7 +116,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiCommentsWithHttpInfo([ ApiGetApiCommentsOptions? options, ]) async {
+  Future<Response> getApiCommentsWithHttpInfo([ ApiGetApiCommentsOptions? options ]) async {
     final page = options?.page;
     final count = options?.count;
     final textSearch = options?.textSearch;
@@ -203,8 +203,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentsResponse?> getApiComments([ ApiGetApiCommentsOptions? options, ]) async {
-    final response = await getApiCommentsWithHttpInfo(options,);
+  Future<ModerationAPIGetCommentsResponse?> getApiComments([ ApiGetApiCommentsOptions? options ]) async {
+    final response = await getApiCommentsWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -226,7 +226,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiExportStatusWithHttpInfo([ ApiGetApiExportStatusOptions? options, ]) async {
+  Future<Response> getApiExportStatusWithHttpInfo([ ApiGetApiExportStatusOptions? options ]) async {
     final batchJobId = options?.batchJobId;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -271,8 +271,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationExportStatusResponse?> getApiExportStatus([ ApiGetApiExportStatusOptions? options, ]) async {
-    final response = await getApiExportStatusWithHttpInfo(options,);
+  Future<ModerationExportStatusResponse?> getApiExportStatus([ ApiGetApiExportStatusOptions? options ]) async {
+    final response = await getApiExportStatusWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -304,7 +304,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getApiIdsWithHttpInfo([ ApiGetApiIdsOptions? options, ]) async {
+  Future<Response> getApiIdsWithHttpInfo([ ApiGetApiIdsOptions? options ]) async {
     final textSearch = options?.textSearch;
     final byIPFromComment = options?.byIPFromComment;
     final filters = options?.filters;
@@ -379,8 +379,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentIdsResponse?> getApiIds([ ApiGetApiIdsOptions? options, ]) async {
-    final response = await getApiIdsWithHttpInfo(options,);
+  Future<ModerationAPIGetCommentIdsResponse?> getApiIds([ ApiGetApiIdsOptions? options ]) async {
+    final response = await getApiIdsWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -402,7 +402,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, [ ApiGetBanUsersFromCommentOptions? options, ]) async {
+  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, [ ApiGetBanUsersFromCommentOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -444,8 +444,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, [ ApiGetBanUsersFromCommentOptions? options, ]) async {
-    final response = await getBanUsersFromCommentWithHttpInfo(commentId, options,);
+  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, [ ApiGetBanUsersFromCommentOptions? options ]) async {
+    final response = await getBanUsersFromCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -467,7 +467,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, [ ApiGetCommentBanStatusOptions? options, ]) async {
+  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, [ ApiGetCommentBanStatusOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -509,8 +509,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, [ ApiGetCommentBanStatusOptions? options, ]) async {
-    final response = await getCommentBanStatusWithHttpInfo(commentId, options,);
+  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, [ ApiGetCommentBanStatusOptions? options ]) async {
+    final response = await getCommentBanStatusWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -532,7 +532,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCommentChildrenWithHttpInfo(String commentId, [ ApiGetCommentChildrenOptions? options, ]) async {
+  Future<Response> getCommentChildrenWithHttpInfo(String commentId, [ ApiGetCommentChildrenOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -574,8 +574,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, [ ApiGetCommentChildrenOptions? options, ]) async {
-    final response = await getCommentChildrenWithHttpInfo(commentId, options,);
+  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, [ ApiGetCommentChildrenOptions? options ]) async {
+    final response = await getCommentChildrenWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -605,7 +605,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCountWithHttpInfo([ ApiGetCountOptions? options, ]) async {
+  Future<Response> getCountWithHttpInfo([ ApiGetCountOptions? options ]) async {
     final textSearch = options?.textSearch;
     final byIPFromComment = options?.byIPFromComment;
     final filter = options?.filter;
@@ -674,8 +674,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPICountCommentsResponse?> getCount([ ApiGetCountOptions? options, ]) async {
-    final response = await getCountWithHttpInfo(options,);
+  Future<ModerationAPICountCommentsResponse?> getCount([ ApiGetCountOptions? options ]) async {
+    final response = await getCountWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -695,7 +695,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getCountsWithHttpInfo([ ApiGetCountsOptions? options, ]) async {
+  Future<Response> getCountsWithHttpInfo([ ApiGetCountsOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -734,8 +734,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetBannedUsersCountResponse?> getCounts([ ApiGetCountsOptions? options, ]) async {
-    final response = await getCountsWithHttpInfo(options,);
+  Future<GetBannedUsersCountResponse?> getCounts([ ApiGetCountsOptions? options ]) async {
+    final response = await getCountsWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -757,7 +757,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getLogsWithHttpInfo(String commentId, [ ApiGetLogsOptions? options, ]) async {
+  Future<Response> getLogsWithHttpInfo(String commentId, [ ApiGetLogsOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -799,8 +799,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, [ ApiGetLogsOptions? options, ]) async {
-    final response = await getLogsWithHttpInfo(commentId, options,);
+  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, [ ApiGetLogsOptions? options ]) async {
+    final response = await getLogsWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -820,7 +820,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesWithHttpInfo([ ApiGetManualBadgesOptions? options, ]) async {
+  Future<Response> getManualBadgesWithHttpInfo([ ApiGetManualBadgesOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -859,8 +859,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetTenantManualBadgesResponse?> getManualBadges([ ApiGetManualBadgesOptions? options, ]) async {
-    final response = await getManualBadgesWithHttpInfo(options,);
+  Future<GetTenantManualBadgesResponse?> getManualBadges([ ApiGetManualBadgesOptions? options ]) async {
+    final response = await getManualBadgesWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -884,7 +884,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesForUserWithHttpInfo([ ApiGetManualBadgesForUserOptions? options, ]) async {
+  Future<Response> getManualBadgesForUserWithHttpInfo([ ApiGetManualBadgesForUserOptions? options ]) async {
     final badgesUserId = options?.badgesUserId;
     final commentId = options?.commentId;
     final tenantId = options?.tenantId;
@@ -935,8 +935,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserManualBadgesResponse?> getManualBadgesForUser([ ApiGetManualBadgesForUserOptions? options, ]) async {
-    final response = await getManualBadgesForUserWithHttpInfo(options,);
+  Future<GetUserManualBadgesResponse?> getManualBadgesForUser([ ApiGetManualBadgesForUserOptions? options ]) async {
+    final response = await getManualBadgesForUserWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -962,7 +962,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentWithHttpInfo(String commentId, [ ApiGetModerationCommentOptions? options, ]) async {
+  Future<Response> getModerationCommentWithHttpInfo(String commentId, [ ApiGetModerationCommentOptions? options ]) async {
     final includeEmail = options?.includeEmail;
     final includeIP = options?.includeIP;
     final tenantId = options?.tenantId;
@@ -1016,8 +1016,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, [ ApiGetModerationCommentOptions? options, ]) async {
-    final response = await getModerationCommentWithHttpInfo(commentId, options,);
+  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, [ ApiGetModerationCommentOptions? options ]) async {
+    final response = await getModerationCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1039,7 +1039,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, [ ApiGetModerationCommentTextOptions? options, ]) async {
+  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, [ ApiGetModerationCommentTextOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -1081,8 +1081,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, [ ApiGetModerationCommentTextOptions? options, ]) async {
-    final response = await getModerationCommentTextWithHttpInfo(commentId, options,);
+  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, [ ApiGetModerationCommentTextOptions? options ]) async {
+    final response = await getModerationCommentTextWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1110,7 +1110,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, [ ApiGetPreBanSummaryOptions? options, ]) async {
+  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, [ ApiGetPreBanSummaryOptions? options ]) async {
     final includeByUserIdAndEmail = options?.includeByUserIdAndEmail;
     final includeByIP = options?.includeByIP;
     final includeByEmailDomain = options?.includeByEmailDomain;
@@ -1170,8 +1170,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<PreBanSummary?> getPreBanSummary(String commentId, [ ApiGetPreBanSummaryOptions? options, ]) async {
-    final response = await getPreBanSummaryWithHttpInfo(commentId, options,);
+  Future<PreBanSummary?> getPreBanSummary(String commentId, [ ApiGetPreBanSummaryOptions? options ]) async {
+    final response = await getPreBanSummaryWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1197,7 +1197,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchCommentsSummaryWithHttpInfo([ ApiGetSearchCommentsSummaryOptions? options, ]) async {
+  Future<Response> getSearchCommentsSummaryWithHttpInfo([ ApiGetSearchCommentsSummaryOptions? options ]) async {
     final value = options?.value;
     final filters = options?.filters;
     final searchFilters = options?.searchFilters;
@@ -1254,8 +1254,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary([ ApiGetSearchCommentsSummaryOptions? options, ]) async {
-    final response = await getSearchCommentsSummaryWithHttpInfo(options,);
+  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary([ ApiGetSearchCommentsSummaryOptions? options ]) async {
+    final response = await getSearchCommentsSummaryWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1277,7 +1277,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchPagesWithHttpInfo([ ApiGetSearchPagesOptions? options, ]) async {
+  Future<Response> getSearchPagesWithHttpInfo([ ApiGetSearchPagesOptions? options ]) async {
     final value = options?.value;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -1322,8 +1322,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationPageSearchResponse?> getSearchPages([ ApiGetSearchPagesOptions? options, ]) async {
-    final response = await getSearchPagesWithHttpInfo(options,);
+  Future<ModerationPageSearchResponse?> getSearchPages([ ApiGetSearchPagesOptions? options ]) async {
+    final response = await getSearchPagesWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1345,7 +1345,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSitesWithHttpInfo([ ApiGetSearchSitesOptions? options, ]) async {
+  Future<Response> getSearchSitesWithHttpInfo([ ApiGetSearchSitesOptions? options ]) async {
     final value = options?.value;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -1390,8 +1390,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationSiteSearchResponse?> getSearchSites([ ApiGetSearchSitesOptions? options, ]) async {
-    final response = await getSearchSitesWithHttpInfo(options,);
+  Future<ModerationSiteSearchResponse?> getSearchSites([ ApiGetSearchSitesOptions? options ]) async {
+    final response = await getSearchSitesWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1413,7 +1413,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSuggestWithHttpInfo([ ApiGetSearchSuggestOptions? options, ]) async {
+  Future<Response> getSearchSuggestWithHttpInfo([ ApiGetSearchSuggestOptions? options ]) async {
     final textSearch = options?.textSearch;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -1458,8 +1458,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationSuggestResponse?> getSearchSuggest([ ApiGetSearchSuggestOptions? options, ]) async {
-    final response = await getSearchSuggestWithHttpInfo(options,);
+  Future<ModerationSuggestResponse?> getSearchSuggest([ ApiGetSearchSuggestOptions? options ]) async {
+    final response = await getSearchSuggestWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1481,7 +1481,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getSearchUsersWithHttpInfo([ ApiGetSearchUsersOptions? options, ]) async {
+  Future<Response> getSearchUsersWithHttpInfo([ ApiGetSearchUsersOptions? options ]) async {
     final value = options?.value;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -1526,8 +1526,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationUserSearchResponse?> getSearchUsers([ ApiGetSearchUsersOptions? options, ]) async {
-    final response = await getSearchUsersWithHttpInfo(options,);
+  Future<ModerationUserSearchResponse?> getSearchUsers([ ApiGetSearchUsersOptions? options ]) async {
+    final response = await getSearchUsersWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1549,7 +1549,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getTrustFactorWithHttpInfo([ ApiGetTrustFactorOptions? options, ]) async {
+  Future<Response> getTrustFactorWithHttpInfo([ ApiGetTrustFactorOptions? options ]) async {
     final userId = options?.userId;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -1594,8 +1594,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserTrustFactorResponse?> getTrustFactor([ ApiGetTrustFactorOptions? options, ]) async {
-    final response = await getTrustFactorWithHttpInfo(options,);
+  Future<GetUserTrustFactorResponse?> getTrustFactor([ ApiGetTrustFactorOptions? options ]) async {
+    final response = await getTrustFactorWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1615,7 +1615,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getUserBanPreferenceWithHttpInfo([ ApiGetUserBanPreferenceOptions? options, ]) async {
+  Future<Response> getUserBanPreferenceWithHttpInfo([ ApiGetUserBanPreferenceOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -1654,8 +1654,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference([ ApiGetUserBanPreferenceOptions? options, ]) async {
-    final response = await getUserBanPreferenceWithHttpInfo(options,);
+  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference([ ApiGetUserBanPreferenceOptions? options ]) async {
+    final response = await getUserBanPreferenceWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1677,7 +1677,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> getUserInternalProfileWithHttpInfo([ ApiGetUserInternalProfileOptions? options, ]) async {
+  Future<Response> getUserInternalProfileWithHttpInfo([ ApiGetUserInternalProfileOptions? options ]) async {
     final commentId = options?.commentId;
     final tenantId = options?.tenantId;
     final sso = options?.sso;
@@ -1722,8 +1722,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<GetUserInternalProfileResponse?> getUserInternalProfile([ ApiGetUserInternalProfileOptions? options, ]) async {
-    final response = await getUserInternalProfileWithHttpInfo(options,);
+  Future<GetUserInternalProfileResponse?> getUserInternalProfile([ ApiGetUserInternalProfileOptions? options ]) async {
+    final response = await getUserInternalProfileWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1749,7 +1749,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options, ]) async {
+  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -1799,8 +1799,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options, ]) async {
-    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams, options,);
+  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options ]) async {
+    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1830,7 +1830,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postApiExportWithHttpInfo([ ApiPostApiExportOptions? options, ]) async {
+  Future<Response> postApiExportWithHttpInfo([ ApiPostApiExportOptions? options ]) async {
     final textSearch = options?.textSearch;
     final byIPFromComment = options?.byIPFromComment;
     final filters = options?.filters;
@@ -1899,8 +1899,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationExportResponse?> postApiExport([ ApiPostApiExportOptions? options, ]) async {
-    final response = await postApiExportWithHttpInfo(options,);
+  Future<ModerationExportResponse?> postApiExport([ ApiPostApiExportOptions? options ]) async {
+    final response = await postApiExportWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1938,7 +1938,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, [ ApiPostBanUserFromCommentOptions? options, ]) async {
+  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, [ ApiPostBanUserFromCommentOptions? options ]) async {
     final banEmail = options?.banEmail;
     final banEmailDomain = options?.banEmailDomain;
     final banIP = options?.banIP;
@@ -2028,8 +2028,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, [ ApiPostBanUserFromCommentOptions? options, ]) async {
-    final response = await postBanUserFromCommentWithHttpInfo(commentId, options,);
+  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, [ ApiPostBanUserFromCommentOptions? options ]) async {
+    final response = await postBanUserFromCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2051,7 +2051,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options, ]) async {
+  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -2092,8 +2092,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options, ]) async {
-    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams, options,);
+  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options ]) async {
+    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2121,7 +2121,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options, ]) async {
+  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options ]) async {
     final includeByUserIdAndEmail = options?.includeByUserIdAndEmail;
     final includeByIP = options?.includeByIP;
     final includeByEmailDomain = options?.includeByEmailDomain;
@@ -2180,8 +2180,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options, ]) async {
-    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams, options,);
+  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options ]) async {
+    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2203,7 +2203,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options, ]) async {
+  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -2244,8 +2244,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options, ]) async {
-    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams, options,);
+  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options ]) async {
+    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2269,7 +2269,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postFlagCommentWithHttpInfo(String commentId, [ ApiPostFlagCommentOptions? options, ]) async {
+  Future<Response> postFlagCommentWithHttpInfo(String commentId, [ ApiPostFlagCommentOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2317,8 +2317,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postFlagComment(String commentId, [ ApiPostFlagCommentOptions? options, ]) async {
-    final response = await postFlagCommentWithHttpInfo(commentId, options,);
+  Future<APIEmptyResponse?> postFlagComment(String commentId, [ ApiPostFlagCommentOptions? options ]) async {
+    final response = await postFlagCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2342,7 +2342,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postRemoveCommentWithHttpInfo(String commentId, [ ApiPostRemoveCommentOptions? options, ]) async {
+  Future<Response> postRemoveCommentWithHttpInfo(String commentId, [ ApiPostRemoveCommentOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2390,8 +2390,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, [ ApiPostRemoveCommentOptions? options, ]) async {
-    final response = await postRemoveCommentWithHttpInfo(commentId, options,);
+  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, [ ApiPostRemoveCommentOptions? options ]) async {
+    final response = await postRemoveCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2415,7 +2415,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, [ ApiPostRestoreDeletedCommentOptions? options, ]) async {
+  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, [ ApiPostRestoreDeletedCommentOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2463,8 +2463,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, [ ApiPostRestoreDeletedCommentOptions? options, ]) async {
-    final response = await postRestoreDeletedCommentWithHttpInfo(commentId, options,);
+  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, [ ApiPostRestoreDeletedCommentOptions? options ]) async {
+    final response = await postRestoreDeletedCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2490,7 +2490,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options, ]) async {
+  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options ]) async {
     final approved = options?.approved;
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
@@ -2544,8 +2544,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options, ]) async {
-    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId, options,);
+  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options ]) async {
+    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2571,7 +2571,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, [ ApiPostSetCommentReviewStatusOptions? options, ]) async {
+  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, [ ApiPostSetCommentReviewStatusOptions? options ]) async {
     final reviewed = options?.reviewed;
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
@@ -2625,8 +2625,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, [ ApiPostSetCommentReviewStatusOptions? options, ]) async {
-    final response = await postSetCommentReviewStatusWithHttpInfo(commentId, options,);
+  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, [ ApiPostSetCommentReviewStatusOptions? options ]) async {
+    final response = await postSetCommentReviewStatusWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2654,7 +2654,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, [ ApiPostSetCommentSpamStatusOptions? options, ]) async {
+  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, [ ApiPostSetCommentSpamStatusOptions? options ]) async {
     final spam = options?.spam;
     final permNotSpam = options?.permNotSpam;
     final tenantId = options?.tenantId;
@@ -2714,8 +2714,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, [ ApiPostSetCommentSpamStatusOptions? options, ]) async {
-    final response = await postSetCommentSpamStatusWithHttpInfo(commentId, options,);
+  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, [ ApiPostSetCommentSpamStatusOptions? options ]) async {
+    final response = await postSetCommentSpamStatusWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2741,7 +2741,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options, ]) async {
+  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2791,8 +2791,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options, ]) async {
-    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams, options,);
+  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options ]) async {
+    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2816,7 +2816,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, [ ApiPostUnFlagCommentOptions? options, ]) async {
+  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, [ ApiPostUnFlagCommentOptions? options ]) async {
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2864,8 +2864,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postUnFlagComment(String commentId, [ ApiPostUnFlagCommentOptions? options, ]) async {
-    final response = await postUnFlagCommentWithHttpInfo(commentId, options,);
+  Future<APIEmptyResponse?> postUnFlagComment(String commentId, [ ApiPostUnFlagCommentOptions? options ]) async {
+    final response = await postUnFlagCommentWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2891,7 +2891,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postVoteWithHttpInfo(String commentId, [ ApiPostVoteOptions? options, ]) async {
+  Future<Response> postVoteWithHttpInfo(String commentId, [ ApiPostVoteOptions? options ]) async {
     final direction = options?.direction;
     final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
@@ -2945,8 +2945,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> postVote(String commentId, [ ApiPostVoteOptions? options, ]) async {
-    final response = await postVoteWithHttpInfo(commentId, options,);
+  Future<VoteResponse?> postVote(String commentId, [ ApiPostVoteOptions? options ]) async {
+    final response = await postVoteWithHttpInfo(commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2974,7 +2974,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, [ ApiPutAwardBadgeOptions? options, ]) async {
+  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, [ ApiPutAwardBadgeOptions? options ]) async {
     final userId = options?.userId;
     final commentId = options?.commentId;
     final tenantId = options?.tenantId;
@@ -3034,8 +3034,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, [ ApiPutAwardBadgeOptions? options, ]) async {
-    final response = await putAwardBadgeWithHttpInfo(badgeId, options,);
+  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, [ ApiPutAwardBadgeOptions? options ]) async {
+    final response = await putAwardBadgeWithHttpInfo(badgeId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3057,7 +3057,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> putCloseThreadWithHttpInfo(String urlId, [ ApiPutCloseThreadOptions? options, ]) async {
+  Future<Response> putCloseThreadWithHttpInfo(String urlId, [ ApiPutCloseThreadOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3099,8 +3099,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putCloseThread(String urlId, [ ApiPutCloseThreadOptions? options, ]) async {
-    final response = await putCloseThreadWithHttpInfo(urlId, options,);
+  Future<APIEmptyResponse?> putCloseThread(String urlId, [ ApiPutCloseThreadOptions? options ]) async {
+    final response = await putCloseThreadWithHttpInfo(urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3128,7 +3128,7 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, [ ApiPutRemoveBadgeOptions? options, ]) async {
+  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, [ ApiPutRemoveBadgeOptions? options ]) async {
     final userId = options?.userId;
     final commentId = options?.commentId;
     final tenantId = options?.tenantId;
@@ -3188,8 +3188,8 @@ class ModerationApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, [ ApiPutRemoveBadgeOptions? options, ]) async {
-    final response = await putRemoveBadgeWithHttpInfo(badgeId, options,);
+  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, [ ApiPutRemoveBadgeOptions? options ]) async {
+    final response = await putRemoveBadgeWithHttpInfo(badgeId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3211,7 +3211,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> putReopenThreadWithHttpInfo(String urlId, [ ApiPutReopenThreadOptions? options, ]) async {
+  Future<Response> putReopenThreadWithHttpInfo(String urlId, [ ApiPutReopenThreadOptions? options ]) async {
     final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3253,8 +3253,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putReopenThread(String urlId, [ ApiPutReopenThreadOptions? options, ]) async {
-    final response = await putReopenThreadWithHttpInfo(urlId, options,);
+  Future<APIEmptyResponse?> putReopenThread(String urlId, [ ApiPutReopenThreadOptions? options ]) async {
+    final response = await putReopenThreadWithHttpInfo(urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3278,7 +3278,7 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<Response> setTrustFactorWithHttpInfo([ ApiSetTrustFactorOptions? options, ]) async {
+  Future<Response> setTrustFactorWithHttpInfo([ ApiSetTrustFactorOptions? options ]) async {
     final userId = options?.userId;
     final trustFactor = options?.trustFactor;
     final tenantId = options?.tenantId;
@@ -3329,8 +3329,8 @@ class ModerationApi {
   /// * [String] tenantId:
   ///
   /// * [String] sso:
-  Future<SetUserTrustFactorResponse?> setTrustFactor([ ApiSetTrustFactorOptions? options, ]) async {
-    final response = await setTrustFactorWithHttpInfo(options,);
+  Future<SetUserTrustFactorResponse?> setTrustFactor([ ApiSetTrustFactorOptions? options ]) async {
+    final response = await setTrustFactorWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
diff --git a/client/lib/api/public_api.dart b/client/lib/api/public_api.dart
index ada0bf0..1e6ee94 100644
--- a/client/lib/api/public_api.dart
+++ b/client/lib/api/public_api.dart
@@ -26,7 +26,7 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> blockFromCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
+  Future<Response> blockFromCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -66,8 +66,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<BlockSuccess?> blockFromCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
-    final response = await blockFromCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, sso,);
+  Future<BlockSuccess?> blockFromCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso ]) async {
+    final response = await blockFromCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -90,7 +90,7 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<Response> checkedCommentsForBlockedWithHttpInfo(String tenantId, String commentIds, [ String? sso, ]) async {
+  Future<Response> checkedCommentsForBlockedWithHttpInfo(String tenantId, String commentIds, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/check-blocked-comments';
 
@@ -129,8 +129,8 @@ class PublicApi {
   ///   A comma separated list of comment ids.
   ///
   /// * [String] sso:
-  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(String tenantId, String commentIds, [ String? sso, ]) async {
-    final response = await checkedCommentsForBlockedWithHttpInfo(tenantId, commentIds, sso,);
+  Future<CheckBlockedCommentsResponse?> checkedCommentsForBlocked(String tenantId, String commentIds, [ String? sso ]) async {
+    final response = await checkedCommentsForBlockedWithHttpInfo(tenantId, commentIds, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -158,7 +158,7 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> createCommentPublicWithHttpInfo(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options, ]) async {
+  Future<Response> createCommentPublicWithHttpInfo(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options ]) async {
     final sessionId = options?.sessionId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -208,8 +208,8 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<SaveCommentsResponseWithPresence?> createCommentPublic(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options, ]) async {
-    final response = await createCommentPublicWithHttpInfo(tenantId, urlId, broadcastId, commentData, options,);
+  Future<SaveCommentsResponseWithPresence?> createCommentPublic(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options ]) async {
+    final response = await createCommentPublicWithHttpInfo(tenantId, urlId, broadcastId, commentData, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -233,7 +233,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> createFeedPostPublicWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options, ]) async {
+  Future<Response> createFeedPostPublicWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -277,8 +277,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> createFeedPostPublic(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options, ]) async {
-    final response = await createFeedPostPublicWithHttpInfo(tenantId, createFeedPostParams, options,);
+  Future<CreateFeedPostResponse?> createFeedPostPublic(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options ]) async {
+    final response = await createFeedPostPublicWithHttpInfo(tenantId, createFeedPostParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -300,7 +300,7 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<Response> createV1PageReactWithHttpInfo(String tenantId, String urlId, [ String? title, ]) async {
+  Future<Response> createV1PageReactWithHttpInfo(String tenantId, String urlId, [ String? title ]) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -338,8 +338,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV1PageReact(String tenantId, String urlId, [ String? title, ]) async {
-    final response = await createV1PageReactWithHttpInfo(tenantId, urlId, title,);
+  Future<CreateV1PageReact?> createV1PageReact(String tenantId, String urlId, [ String? title ]) async {
+    final response = await createV1PageReactWithHttpInfo(tenantId, urlId, title);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -363,7 +363,7 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<Response> createV2PageReactWithHttpInfo(String tenantId, String urlId, String id, [ String? title, ]) async {
+  Future<Response> createV2PageReactWithHttpInfo(String tenantId, String urlId, String id, [ String? title ]) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -404,8 +404,8 @@ class PublicApi {
   /// * [String] id (required):
   ///
   /// * [String] title:
-  Future<CreateV1PageReact?> createV2PageReact(String tenantId, String urlId, String id, [ String? title, ]) async {
-    final response = await createV2PageReactWithHttpInfo(tenantId, urlId, id, title,);
+  Future<CreateV1PageReact?> createV2PageReact(String tenantId, String urlId, String id, [ String? title ]) async {
+    final response = await createV2PageReactWithHttpInfo(tenantId, urlId, id, title);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -431,7 +431,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentPublicWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options, ]) async {
+  Future<Response> deleteCommentPublicWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -479,8 +479,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options, ]) async {
-    final response = await deleteCommentPublicWithHttpInfo(tenantId, commentId, broadcastId, options,);
+  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options ]) async {
+    final response = await deleteCommentPublicWithHttpInfo(tenantId, commentId, broadcastId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -510,7 +510,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentVoteWithHttpInfo(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options, ]) async {
+  Future<Response> deleteCommentVoteWithHttpInfo(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -564,8 +564,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteCommentVote(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options, ]) async {
-    final response = await deleteCommentVoteWithHttpInfo(tenantId, commentId, voteId, urlId, broadcastId, options,);
+  Future<VoteDeleteResponse?> deleteCommentVote(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options ]) async {
+    final response = await deleteCommentVoteWithHttpInfo(tenantId, commentId, voteId, urlId, broadcastId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -589,7 +589,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteFeedPostPublicWithHttpInfo(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options, ]) async {
+  Future<Response> deleteFeedPostPublicWithHttpInfo(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -634,8 +634,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options, ]) async {
-    final response = await deleteFeedPostPublicWithHttpInfo(tenantId, postId, options,);
+  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options ]) async {
+    final response = await deleteFeedPostPublicWithHttpInfo(tenantId, postId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -655,7 +655,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> deleteV1PageReactWithHttpInfo(String tenantId, String urlId, ) async {
+  Future<Response> deleteV1PageReactWithHttpInfo(String tenantId, String urlId) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -688,8 +688,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<CreateV1PageReact?> deleteV1PageReact(String tenantId, String urlId, ) async {
-    final response = await deleteV1PageReactWithHttpInfo(tenantId, urlId, );
+  Future<CreateV1PageReact?> deleteV1PageReact(String tenantId, String urlId) async {
+    final response = await deleteV1PageReactWithHttpInfo(tenantId, urlId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -711,7 +711,7 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<Response> deleteV2PageReactWithHttpInfo(String tenantId, String urlId, String id, ) async {
+  Future<Response> deleteV2PageReactWithHttpInfo(String tenantId, String urlId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -747,8 +747,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<CreateV1PageReact?> deleteV2PageReact(String tenantId, String urlId, String id, ) async {
-    final response = await deleteV2PageReactWithHttpInfo(tenantId, urlId, id, );
+  Future<CreateV1PageReact?> deleteV2PageReact(String tenantId, String urlId, String id) async {
+    final response = await deleteV2PageReactWithHttpInfo(tenantId, urlId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -772,7 +772,7 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<Response> flagCommentPublicWithHttpInfo(String tenantId, String commentId, bool isFlagged, [ String? sso, ]) async {
+  Future<Response> flagCommentPublicWithHttpInfo(String tenantId, String commentId, bool isFlagged, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -813,8 +813,8 @@ class PublicApi {
   /// * [bool] isFlagged (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> flagCommentPublic(String tenantId, String commentId, bool isFlagged, [ String? sso, ]) async {
-    final response = await flagCommentPublicWithHttpInfo(tenantId, commentId, isFlagged, sso,);
+  Future<APIEmptyResponse?> flagCommentPublic(String tenantId, String commentId, bool isFlagged, [ String? sso ]) async {
+    final response = await flagCommentPublicWithHttpInfo(tenantId, commentId, isFlagged, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -838,7 +838,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> getCommentTextWithHttpInfo(String tenantId, String commentId, [ ApiGetCommentTextOptions? options, ]) async {
+  Future<Response> getCommentTextWithHttpInfo(String tenantId, String commentId, [ ApiGetCommentTextOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -883,8 +883,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIGetCommentTextResponse?> getCommentText(String tenantId, String commentId, [ ApiGetCommentTextOptions? options, ]) async {
-    final response = await getCommentTextWithHttpInfo(tenantId, commentId, options,);
+  Future<PublicAPIGetCommentTextResponse?> getCommentText(String tenantId, String commentId, [ ApiGetCommentTextOptions? options ]) async {
+    final response = await getCommentTextWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -908,7 +908,7 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<Response> getCommentVoteUserNamesWithHttpInfo(String tenantId, String commentId, int dir, [ String? sso, ]) async {
+  Future<Response> getCommentVoteUserNamesWithHttpInfo(String tenantId, String commentId, int dir, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/votes'
       .replaceAll('{tenantId}', tenantId)
@@ -949,8 +949,8 @@ class PublicApi {
   /// * [int] dir (required):
   ///
   /// * [String] sso:
-  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(String tenantId, String commentId, int dir, [ String? sso, ]) async {
-    final response = await getCommentVoteUserNamesWithHttpInfo(tenantId, commentId, dir, sso,);
+  Future<GetCommentVoteUserNamesSuccessResponse?> getCommentVoteUserNames(String tenantId, String commentId, int dir, [ String? sso ]) async {
+    final response = await getCommentVoteUserNamesWithHttpInfo(tenantId, commentId, dir, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -980,7 +980,7 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<Response> getCommentsForUserWithHttpInfo([ ApiGetCommentsForUserOptions? options, ]) async {
+  Future<Response> getCommentsForUserWithHttpInfo([ ApiGetCommentsForUserOptions? options ]) async {
     final userId = options?.userId;
     final direction = options?.direction;
     final repliesToUserId = options?.repliesToUserId;
@@ -1049,8 +1049,8 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<GetCommentsForUserResponse?> getCommentsForUser([ ApiGetCommentsForUserOptions? options, ]) async {
-    final response = await getCommentsForUserWithHttpInfo(options,);
+  Future<GetCommentsForUserResponse?> getCommentsForUser([ ApiGetCommentsForUserOptions? options ]) async {
+    final response = await getCommentsForUserWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1125,7 +1125,7 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<Response> getCommentsPublicWithHttpInfo(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options, ]) async {
+  Future<Response> getCommentsPublicWithHttpInfo(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options ]) async {
     final page = options?.page;
     final direction = options?.direction;
     final sso = options?.sso;
@@ -1316,8 +1316,8 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options, ]) async {
-    final response = await getCommentsPublicWithHttpInfo(tenantId, urlId, options,);
+  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options ]) async {
+    final response = await getCommentsPublicWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1346,7 +1346,7 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
+  Future<Response> getEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime ]) async {
     // ignore: prefer_const_declarations
     final path = r'/event-log/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1392,8 +1392,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
-    final response = await getEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, endTime,);
+  Future<GetEventLogResponse?> getEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime ]) async {
+    final response = await getEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, endTime);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1426,7 +1426,7 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<Response> getFeedPostsPublicWithHttpInfo(String tenantId, [ ApiGetFeedPostsPublicOptions? options, ]) async {
+  Future<Response> getFeedPostsPublicWithHttpInfo(String tenantId, [ ApiGetFeedPostsPublicOptions? options ]) async {
     final afterId = options?.afterId;
     final limit = options?.limit;
     final tags = options?.tags;
@@ -1494,8 +1494,8 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<PublicFeedPostsResponse?> getFeedPostsPublic(String tenantId, [ ApiGetFeedPostsPublicOptions? options, ]) async {
-    final response = await getFeedPostsPublicWithHttpInfo(tenantId, options,);
+  Future<PublicFeedPostsResponse?> getFeedPostsPublic(String tenantId, [ ApiGetFeedPostsPublicOptions? options ]) async {
+    final response = await getFeedPostsPublicWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1517,7 +1517,7 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<Response> getFeedPostsStatsWithHttpInfo(String tenantId, List<String> postIds, [ String? sso, ]) async {
+  Future<Response> getFeedPostsStatsWithHttpInfo(String tenantId, List<String> postIds, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/feed-posts/{tenantId}/stats'
       .replaceAll('{tenantId}', tenantId);
@@ -1555,8 +1555,8 @@ class PublicApi {
   /// * [List<String>] postIds (required):
   ///
   /// * [String] sso:
-  Future<FeedPostsStatsResponse?> getFeedPostsStats(String tenantId, List<String> postIds, [ String? sso, ]) async {
-    final response = await getFeedPostsStatsWithHttpInfo(tenantId, postIds, sso,);
+  Future<FeedPostsStatsResponse?> getFeedPostsStats(String tenantId, List<String> postIds, [ String? sso ]) async {
+    final response = await getFeedPostsStatsWithHttpInfo(tenantId, postIds, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1576,7 +1576,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] largeInternalURLSanitized (required):
-  Future<Response> getGifLargeWithHttpInfo(String tenantId, String largeInternalURLSanitized, ) async {
+  Future<Response> getGifLargeWithHttpInfo(String tenantId, String largeInternalURLSanitized) async {
     // ignore: prefer_const_declarations
     final path = r'/gifs/get-large/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1609,8 +1609,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] largeInternalURLSanitized (required):
-  Future<GifGetLargeResponse?> getGifLarge(String tenantId, String largeInternalURLSanitized, ) async {
-    final response = await getGifLargeWithHttpInfo(tenantId, largeInternalURLSanitized, );
+  Future<GifGetLargeResponse?> getGifLarge(String tenantId, String largeInternalURLSanitized) async {
+    final response = await getGifLargeWithHttpInfo(tenantId, largeInternalURLSanitized);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1636,7 +1636,7 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsSearchWithHttpInfo(String tenantId, String search, [ ApiGetGifsSearchOptions? options, ]) async {
+  Future<Response> getGifsSearchWithHttpInfo(String tenantId, String search, [ ApiGetGifsSearchOptions? options ]) async {
     final locale = options?.locale;
     final rating = options?.rating;
     final page = options?.page;
@@ -1687,8 +1687,8 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsSearchResponse?> getGifsSearch(String tenantId, String search, [ ApiGetGifsSearchOptions? options, ]) async {
-    final response = await getGifsSearchWithHttpInfo(tenantId, search, options,);
+  Future<GetGifsSearchResponse?> getGifsSearch(String tenantId, String search, [ ApiGetGifsSearchOptions? options ]) async {
+    final response = await getGifsSearchWithHttpInfo(tenantId, search, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1712,7 +1712,7 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsTrendingWithHttpInfo(String tenantId, [ ApiGetGifsTrendingOptions? options, ]) async {
+  Future<Response> getGifsTrendingWithHttpInfo(String tenantId, [ ApiGetGifsTrendingOptions? options ]) async {
     final locale = options?.locale;
     final rating = options?.rating;
     final page = options?.page;
@@ -1760,8 +1760,8 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsTrendingResponse?> getGifsTrending(String tenantId, [ ApiGetGifsTrendingOptions? options, ]) async {
-    final response = await getGifsTrendingWithHttpInfo(tenantId, options,);
+  Future<GetGifsTrendingResponse?> getGifsTrending(String tenantId, [ ApiGetGifsTrendingOptions? options ]) async {
+    final response = await getGifsTrendingWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1790,7 +1790,7 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<Response> getGlobalEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
+  Future<Response> getGlobalEventLogWithHttpInfo(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime ]) async {
     // ignore: prefer_const_declarations
     final path = r'/event-log/global/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -1836,8 +1836,8 @@ class PublicApi {
   /// * [int] startTime (required):
   ///
   /// * [int] endTime:
-  Future<GetEventLogResponse?> getGlobalEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime, ]) async {
-    final response = await getGlobalEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, endTime,);
+  Future<GetEventLogResponse?> getGlobalEventLog(String tenantId, String urlId, String userIdWS, int startTime, [ int? endTime ]) async {
+    final response = await getGlobalEventLogWithHttpInfo(tenantId, urlId, userIdWS, startTime, endTime);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1867,7 +1867,7 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOfflineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options, ]) async {
+  Future<Response> getOfflineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options ]) async {
     final afterName = options?.afterName;
     final afterUserId = options?.afterUserId;
     // ignore: prefer_const_declarations
@@ -1917,8 +1917,8 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOfflineResponse?> getOfflineUsers(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options, ]) async {
-    final response = await getOfflineUsersWithHttpInfo(tenantId, urlId, options,);
+  Future<PageUsersOfflineResponse?> getOfflineUsers(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options ]) async {
+    final response = await getOfflineUsersWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1948,7 +1948,7 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOnlineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options, ]) async {
+  Future<Response> getOnlineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options ]) async {
     final afterName = options?.afterName;
     final afterUserId = options?.afterUserId;
     // ignore: prefer_const_declarations
@@ -1998,8 +1998,8 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOnlineResponse?> getOnlineUsers(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options, ]) async {
-    final response = await getOnlineUsersWithHttpInfo(tenantId, urlId, options,);
+  Future<PageUsersOnlineResponse?> getOnlineUsers(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options ]) async {
+    final response = await getOnlineUsersWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2035,7 +2035,7 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<Response> getPagesPublicWithHttpInfo(String tenantId, [ ApiGetPagesPublicOptions? options, ]) async {
+  Future<Response> getPagesPublicWithHttpInfo(String tenantId, [ ApiGetPagesPublicOptions? options ]) async {
     final cursor = options?.cursor;
     final limit = options?.limit;
     final q = options?.q;
@@ -2102,8 +2102,8 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<GetPublicPagesResponse?> getPagesPublic(String tenantId, [ ApiGetPagesPublicOptions? options, ]) async {
-    final response = await getPagesPublicWithHttpInfo(tenantId, options,);
+  Future<GetPublicPagesResponse?> getPagesPublic(String tenantId, [ ApiGetPagesPublicOptions? options ]) async {
+    final response = await getPagesPublicWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2127,7 +2127,7 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<Response> getTranslationsWithHttpInfo(String namespace, String component, [ ApiGetTranslationsOptions? options, ]) async {
+  Future<Response> getTranslationsWithHttpInfo(String namespace, String component, [ ApiGetTranslationsOptions? options ]) async {
     final locale = options?.locale;
     final useFullTranslationIds = options?.useFullTranslationIds;
     // ignore: prefer_const_declarations
@@ -2172,8 +2172,8 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<GetTranslationsResponse?> getTranslations(String namespace, String component, [ ApiGetTranslationsOptions? options, ]) async {
-    final response = await getTranslationsWithHttpInfo(namespace, component, options,);
+  Future<GetTranslationsResponse?> getTranslations(String namespace, String component, [ ApiGetTranslationsOptions? options ]) async {
+    final response = await getTranslationsWithHttpInfo(namespace, component, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2193,7 +2193,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationCountWithHttpInfo(String tenantId, [ String? sso, ]) async {
+  Future<Response> getUserNotificationCountWithHttpInfo(String tenantId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/get-count';
 
@@ -2228,8 +2228,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<GetUserNotificationCountResponse?> getUserNotificationCount(String tenantId, [ String? sso, ]) async {
-    final response = await getUserNotificationCountWithHttpInfo(tenantId, sso,);
+  Future<GetUserNotificationCountResponse?> getUserNotificationCount(String tenantId, [ String? sso ]) async {
+    final response = await getUserNotificationCountWithHttpInfo(tenantId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2270,7 +2270,7 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationsWithHttpInfo(String tenantId, [ ApiGetUserNotificationsOptions? options, ]) async {
+  Future<Response> getUserNotificationsWithHttpInfo(String tenantId, [ ApiGetUserNotificationsOptions? options ]) async {
     final urlId = options?.urlId;
     final pageSize = options?.pageSize;
     final afterId = options?.afterId;
@@ -2367,8 +2367,8 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<GetMyNotificationsResponse?> getUserNotifications(String tenantId, [ ApiGetUserNotificationsOptions? options, ]) async {
-    final response = await getUserNotificationsWithHttpInfo(tenantId, options,);
+  Future<GetMyNotificationsResponse?> getUserNotifications(String tenantId, [ ApiGetUserNotificationsOptions? options ]) async {
+    final response = await getUserNotificationsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2390,7 +2390,7 @@ class PublicApi {
   /// * [String] urlIdWS (required):
   ///
   /// * [String] userIds (required):
-  Future<Response> getUserPresenceStatusesWithHttpInfo(String tenantId, String urlIdWS, String userIds, ) async {
+  Future<Response> getUserPresenceStatusesWithHttpInfo(String tenantId, String urlIdWS, String userIds) async {
     // ignore: prefer_const_declarations
     final path = r'/user-presence-status';
 
@@ -2426,8 +2426,8 @@ class PublicApi {
   /// * [String] urlIdWS (required):
   ///
   /// * [String] userIds (required):
-  Future<GetUserPresenceStatusesResponse?> getUserPresenceStatuses(String tenantId, String urlIdWS, String userIds, ) async {
-    final response = await getUserPresenceStatusesWithHttpInfo(tenantId, urlIdWS, userIds, );
+  Future<GetUserPresenceStatusesResponse?> getUserPresenceStatuses(String tenantId, String urlIdWS, String userIds) async {
+    final response = await getUserPresenceStatusesWithHttpInfo(tenantId, urlIdWS, userIds);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2449,7 +2449,7 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<Response> getUserReactsPublicWithHttpInfo(String tenantId, [ ApiGetUserReactsPublicOptions? options, ]) async {
+  Future<Response> getUserReactsPublicWithHttpInfo(String tenantId, [ ApiGetUserReactsPublicOptions? options ]) async {
     final postIds = options?.postIds;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -2491,8 +2491,8 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<UserReactsResponse?> getUserReactsPublic(String tenantId, [ ApiGetUserReactsPublicOptions? options, ]) async {
-    final response = await getUserReactsPublicWithHttpInfo(tenantId, options,);
+  Future<UserReactsResponse?> getUserReactsPublic(String tenantId, [ ApiGetUserReactsPublicOptions? options ]) async {
+    final response = await getUserReactsPublicWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2516,7 +2516,7 @@ class PublicApi {
   ///
   /// * [String] ids (required):
   ///   Comma-delimited userIds.
-  Future<Response> getUsersInfoWithHttpInfo(String tenantId, String ids, ) async {
+  Future<Response> getUsersInfoWithHttpInfo(String tenantId, String ids) async {
     // ignore: prefer_const_declarations
     final path = r'/pages/{tenantId}/users/info'
       .replaceAll('{tenantId}', tenantId);
@@ -2552,8 +2552,8 @@ class PublicApi {
   ///
   /// * [String] ids (required):
   ///   Comma-delimited userIds.
-  Future<PageUsersInfoResponse?> getUsersInfo(String tenantId, String ids, ) async {
-    final response = await getUsersInfoWithHttpInfo(tenantId, ids, );
+  Future<PageUsersInfoResponse?> getUsersInfo(String tenantId, String ids) async {
+    final response = await getUsersInfoWithHttpInfo(tenantId, ids);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2573,7 +2573,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getV1PageLikesWithHttpInfo(String tenantId, String urlId, ) async {
+  Future<Response> getV1PageLikesWithHttpInfo(String tenantId, String urlId) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v1/likes/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2606,8 +2606,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetV1PageLikes?> getV1PageLikes(String tenantId, String urlId, ) async {
-    final response = await getV1PageLikesWithHttpInfo(tenantId, urlId, );
+  Future<GetV1PageLikes?> getV1PageLikes(String tenantId, String urlId) async {
+    final response = await getV1PageLikesWithHttpInfo(tenantId, urlId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2629,7 +2629,7 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<Response> getV2PageReactUsersWithHttpInfo(String tenantId, String urlId, String id, ) async {
+  Future<Response> getV2PageReactUsersWithHttpInfo(String tenantId, String urlId, String id) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}/list'
       .replaceAll('{tenantId}', tenantId);
@@ -2665,8 +2665,8 @@ class PublicApi {
   /// * [String] urlId (required):
   ///
   /// * [String] id (required):
-  Future<GetV2PageReactUsersResponse?> getV2PageReactUsers(String tenantId, String urlId, String id, ) async {
-    final response = await getV2PageReactUsersWithHttpInfo(tenantId, urlId, id, );
+  Future<GetV2PageReactUsersResponse?> getV2PageReactUsers(String tenantId, String urlId, String id) async {
+    final response = await getV2PageReactUsersWithHttpInfo(tenantId, urlId, id);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2686,7 +2686,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<Response> getV2PageReactsWithHttpInfo(String tenantId, String urlId, ) async {
+  Future<Response> getV2PageReactsWithHttpInfo(String tenantId, String urlId) async {
     // ignore: prefer_const_declarations
     final path = r'/page-reacts/v2/{tenantId}'
       .replaceAll('{tenantId}', tenantId);
@@ -2719,8 +2719,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] urlId (required):
-  Future<GetV2PageReacts?> getV2PageReacts(String tenantId, String urlId, ) async {
-    final response = await getV2PageReactsWithHttpInfo(tenantId, urlId, );
+  Future<GetV2PageReacts?> getV2PageReacts(String tenantId, String urlId) async {
+    final response = await getV2PageReactsWithHttpInfo(tenantId, urlId);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2744,7 +2744,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> lockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+  Future<Response> lockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/lock'
       .replaceAll('{tenantId}', tenantId)
@@ -2785,8 +2785,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> lockComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
-    final response = await lockCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
+  Future<APIEmptyResponse?> lockComment(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
+    final response = await lockCommentWithHttpInfo(tenantId, commentId, broadcastId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2851,7 +2851,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> pinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+  Future<Response> pinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/pin'
       .replaceAll('{tenantId}', tenantId)
@@ -2892,8 +2892,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> pinComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
-    final response = await pinCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
+  Future<ChangeCommentPinStatusResponse?> pinComment(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
+    final response = await pinCommentWithHttpInfo(tenantId, commentId, broadcastId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2921,7 +2921,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> reactFeedPostPublicWithHttpInfo(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options, ]) async {
+  Future<Response> reactFeedPostPublicWithHttpInfo(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options ]) async {
     final isUndo = options?.isUndo;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2974,8 +2974,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<ReactFeedPostResponse?> reactFeedPostPublic(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options, ]) async {
-    final response = await reactFeedPostPublicWithHttpInfo(tenantId, postId, reactBodyParams, options,);
+  Future<ReactFeedPostResponse?> reactFeedPostPublic(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options ]) async {
+    final response = await reactFeedPostPublicWithHttpInfo(tenantId, postId, reactBodyParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2995,7 +2995,7 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationCountWithHttpInfo(String tenantId, [ String? sso, ]) async {
+  Future<Response> resetUserNotificationCountWithHttpInfo(String tenantId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/reset-count';
 
@@ -3030,8 +3030,8 @@ class PublicApi {
   /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(String tenantId, [ String? sso, ]) async {
-    final response = await resetUserNotificationCountWithHttpInfo(tenantId, sso,);
+  Future<ResetUserNotificationsResponse?> resetUserNotificationCount(String tenantId, [ String? sso ]) async {
+    final response = await resetUserNotificationCountWithHttpInfo(tenantId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3061,7 +3061,7 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationsWithHttpInfo(String tenantId, [ ApiResetUserNotificationsOptions? options, ]) async {
+  Future<Response> resetUserNotificationsWithHttpInfo(String tenantId, [ ApiResetUserNotificationsOptions? options ]) async {
     final afterId = options?.afterId;
     final afterCreatedAt = options?.afterCreatedAt;
     final unreadOnly = options?.unreadOnly;
@@ -3127,8 +3127,8 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotifications(String tenantId, [ ApiResetUserNotificationsOptions? options, ]) async {
-    final response = await resetUserNotificationsWithHttpInfo(tenantId, options,);
+  Future<ResetUserNotificationsResponse?> resetUserNotifications(String tenantId, [ ApiResetUserNotificationsOptions? options ]) async {
+    final response = await resetUserNotificationsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3156,7 +3156,7 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<Response> searchUsersWithHttpInfo(String tenantId, String urlId, [ ApiSearchUsersOptions? options, ]) async {
+  Future<Response> searchUsersWithHttpInfo(String tenantId, String urlId, [ ApiSearchUsersOptions? options ]) async {
     final usernameStartsWith = options?.usernameStartsWith;
     final mentionGroupIds = options?.mentionGroupIds;
     final sso = options?.sso;
@@ -3213,8 +3213,8 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<SearchUsersResult?> searchUsers(String tenantId, String urlId, [ ApiSearchUsersOptions? options, ]) async {
-    final response = await searchUsersWithHttpInfo(tenantId, urlId, options,);
+  Future<SearchUsersResult?> searchUsers(String tenantId, String urlId, [ ApiSearchUsersOptions? options ]) async {
+    final response = await searchUsersWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3242,7 +3242,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> setCommentTextWithHttpInfo(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options, ]) async {
+  Future<Response> setCommentTextWithHttpInfo(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3292,8 +3292,8 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPISetCommentTextResponse?> setCommentText(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options, ]) async {
-    final response = await setCommentTextWithHttpInfo(tenantId, commentId, broadcastId, commentTextUpdateRequest, options,);
+  Future<PublicAPISetCommentTextResponse?> setCommentText(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options ]) async {
+    final response = await setCommentTextWithHttpInfo(tenantId, commentId, broadcastId, commentTextUpdateRequest, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3317,7 +3317,7 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<Response> unBlockCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
+  Future<Response> unBlockCommentPublicWithHttpInfo(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/block-from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
@@ -3357,8 +3357,8 @@ class PublicApi {
   /// * [PublicBlockFromCommentParams] publicBlockFromCommentParams (required):
   ///
   /// * [String] sso:
-  Future<UnblockSuccess?> unBlockCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso, ]) async {
-    final response = await unBlockCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, sso,);
+  Future<UnblockSuccess?> unBlockCommentPublic(String tenantId, String commentId, PublicBlockFromCommentParams publicBlockFromCommentParams, [ String? sso ]) async {
+    final response = await unBlockCommentPublicWithHttpInfo(tenantId, commentId, publicBlockFromCommentParams, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3382,7 +3382,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unLockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+  Future<Response> unLockCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unlock'
       .replaceAll('{tenantId}', tenantId)
@@ -3423,8 +3423,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> unLockComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
-    final response = await unLockCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
+  Future<APIEmptyResponse?> unLockComment(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
+    final response = await unLockCommentWithHttpInfo(tenantId, commentId, broadcastId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3448,7 +3448,7 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<Response> unPinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
+  Future<Response> unPinCommentWithHttpInfo(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/comments/{tenantId}/{commentId}/unpin'
       .replaceAll('{tenantId}', tenantId)
@@ -3489,8 +3489,8 @@ class PublicApi {
   /// * [String] broadcastId (required):
   ///
   /// * [String] sso:
-  Future<ChangeCommentPinStatusResponse?> unPinComment(String tenantId, String commentId, String broadcastId, [ String? sso, ]) async {
-    final response = await unPinCommentWithHttpInfo(tenantId, commentId, broadcastId, sso,);
+  Future<ChangeCommentPinStatusResponse?> unPinComment(String tenantId, String commentId, String broadcastId, [ String? sso ]) async {
+    final response = await unPinCommentWithHttpInfo(tenantId, commentId, broadcastId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3516,7 +3516,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> updateFeedPostPublicWithHttpInfo(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options, ]) async {
+  Future<Response> updateFeedPostPublicWithHttpInfo(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3563,8 +3563,8 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> updateFeedPostPublic(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options, ]) async {
-    final response = await updateFeedPostPublicWithHttpInfo(tenantId, postId, updateFeedPostParams, options,);
+  Future<CreateFeedPostResponse?> updateFeedPostPublic(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options ]) async {
+    final response = await updateFeedPostPublicWithHttpInfo(tenantId, postId, updateFeedPostParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3593,7 +3593,7 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(String tenantId, String notificationId, String optedInOrOut, String commentId, [ String? sso, ]) async {
+  Future<Response> updateUserNotificationCommentSubscriptionStatusWithHttpInfo(String tenantId, String notificationId, String optedInOrOut, String commentId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark-opted/{optedInOrOut}'
       .replaceAll('{notificationId}', notificationId)
@@ -3639,8 +3639,8 @@ class PublicApi {
   /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(String tenantId, String notificationId, String optedInOrOut, String commentId, [ String? sso, ]) async {
-    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(tenantId, notificationId, optedInOrOut, commentId, sso,);
+  Future<UpdateUserNotificationCommentSubscriptionStatusResponse?> updateUserNotificationCommentSubscriptionStatus(String tenantId, String notificationId, String optedInOrOut, String commentId, [ String? sso ]) async {
+    final response = await updateUserNotificationCommentSubscriptionStatusWithHttpInfo(tenantId, notificationId, optedInOrOut, commentId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3671,7 +3671,7 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ String? sso, ]) async {
+  Future<Response> updateUserNotificationPageSubscriptionStatusWithHttpInfo(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/set-subscription-state/{subscribedOrUnsubscribed}'
       .replaceAll('{subscribedOrUnsubscribed}', subscribedOrUnsubscribed);
@@ -3720,8 +3720,8 @@ class PublicApi {
   /// * [String] subscribedOrUnsubscribed (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ String? sso, ]) async {
-    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso,);
+  Future<UpdateUserNotificationPageSubscriptionStatusResponse?> updateUserNotificationPageSubscriptionStatus(String tenantId, String urlId, String url, String pageTitle, String subscribedOrUnsubscribed, [ String? sso ]) async {
+    final response = await updateUserNotificationPageSubscriptionStatusWithHttpInfo(tenantId, urlId, url, pageTitle, subscribedOrUnsubscribed, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3745,7 +3745,7 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<Response> updateUserNotificationStatusWithHttpInfo(String tenantId, String notificationId, String newStatus, [ String? sso, ]) async {
+  Future<Response> updateUserNotificationStatusWithHttpInfo(String tenantId, String notificationId, String newStatus, [ String? sso ]) async {
     // ignore: prefer_const_declarations
     final path = r'/user-notifications/{notificationId}/mark/{newStatus}'
       .replaceAll('{notificationId}', notificationId)
@@ -3786,8 +3786,8 @@ class PublicApi {
   /// * [String] newStatus (required):
   ///
   /// * [String] sso:
-  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(String tenantId, String notificationId, String newStatus, [ String? sso, ]) async {
-    final response = await updateUserNotificationStatusWithHttpInfo(tenantId, notificationId, newStatus, sso,);
+  Future<UpdateUserNotificationStatusResponse?> updateUserNotificationStatus(String tenantId, String notificationId, String newStatus, [ String? sso ]) async {
+    final response = await updateUserNotificationStatusWithHttpInfo(tenantId, notificationId, newStatus, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3816,7 +3816,7 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<Response> uploadImageWithHttpInfo(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options, ]) async {
+  Future<Response> uploadImageWithHttpInfo(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options ]) async {
     final sizePreset = options?.sizePreset;
     final urlId = options?.urlId;
     // ignore: prefer_const_declarations
@@ -3874,8 +3874,8 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<UploadImageResponse?> uploadImage(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options, ]) async {
-    final response = await uploadImageWithHttpInfo(tenantId, file, options,);
+  Future<UploadImageResponse?> uploadImage(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options ]) async {
+    final response = await uploadImageWithHttpInfo(tenantId, file, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3905,7 +3905,7 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> voteCommentWithHttpInfo(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options, ]) async {
+  Future<Response> voteCommentWithHttpInfo(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options ]) async {
     final sessionId = options?.sessionId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3958,8 +3958,8 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> voteComment(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options, ]) async {
-    final response = await voteCommentWithHttpInfo(tenantId, commentId, urlId, broadcastId, voteBodyParams, options,);
+  Future<VoteResponse?> voteComment(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options ]) async {
+    final response = await voteCommentWithHttpInfo(tenantId, commentId, urlId, broadcastId, voteBodyParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

From fde12797c8f892033a3cbca71fbe1a88f2841ff2 Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Mon, 29 Jun 2026 17:07:23 -0700
Subject: [PATCH 7/9] Regenerate: mod_api/ paths + PostRemoveCommentApiResponse
 rename; drop Api prefix from options types

Options types renamed Api<Op>Options -> <Op>Options (e.g. ApiGetApiCommentsOptions -> GetApiCommentsOptions). Hand-written READMEs + SSO tests updated to match.
---
 README.md                                     |    2 +-
 client/.openapi-generator/FILES               |    6 +-
 client/README.md                              |   88 +-
 client/doc/DefaultApi.md                      |  144 +-
 client/doc/ModerationApi.md                   |  426 +++---
 ...nse.md => PostRemoveCommentApiResponse.md} |    2 +-
 client/doc/PublicApi.md                       |   96 +-
 client/lib/api.dart                           |    2 +-
 client/lib/api/default_api.dart               |  288 ++--
 client/lib/api/moderation_api.dart            | 1263 ++++++-----------
 client/lib/api/public_api.dart                |  192 +--
 client/lib/api_client.dart                    |    4 +-
 ... => post_remove_comment_api_response.dart} |   44 +-
 client/test/default_api_test.dart             |    8 +-
 client/test/moderation_api_test.dart          |   86 +-
 ...ost_remove_comment_api_response_test.dart} |    6 +-
 openapi.json                                  |  614 ++++----
 sso_tests/test/sso_integration_test.dart      |    4 +-
 18 files changed, 1472 insertions(+), 1803 deletions(-)
 rename client/doc/{PostRemoveCommentResponse.md => PostRemoveCommentApiResponse.md} (88%)
 rename client/lib/model/{post_remove_comment_response.dart => post_remove_comment_api_response.dart} (62%)
 rename client/test/{post_remove_comment_response_test.dart => post_remove_comment_api_response_test.dart} (79%)

diff --git a/README.md b/README.md
index 3530df6..864b56c 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ import 'package:fastcomments_dart/api.dart';
 
 final moderation = ModerationApi(ApiClient(basePath: 'https://fastcomments.com'));
 final result = await moderation.getApiComments(
-  ApiGetApiCommentsOptions(sso: 'SSO_TOKEN'),
+  GetApiCommentsOptions(sso: 'SSO_TOKEN'),
 );
 ```
 
diff --git a/client/.openapi-generator/FILES b/client/.openapi-generator/FILES
index d0052f4..7b4612a 100644
--- a/client/.openapi-generator/FILES
+++ b/client/.openapi-generator/FILES
@@ -264,7 +264,7 @@ doc/PatchDomainConfigResponse.md
 doc/PatchPageAPIResponse.md
 doc/PatchSSOUserAPIResponse.md
 doc/PendingCommentToSyncOutbound.md
-doc/PostRemoveCommentResponse.md
+doc/PostRemoveCommentApiResponse.md
 doc/PreBanSummary.md
 doc/PubSubComment.md
 doc/PubSubCommentBase.md
@@ -638,7 +638,7 @@ lib/model/patch_domain_config_response.dart
 lib/model/patch_page_api_response.dart
 lib/model/patch_sso_user_api_response.dart
 lib/model/pending_comment_to_sync_outbound.dart
-lib/model/post_remove_comment_response.dart
+lib/model/post_remove_comment_api_response.dart
 lib/model/pre_ban_summary.dart
 lib/model/pub_sub_comment.dart
 lib/model/pub_sub_comment_base.dart
@@ -1001,7 +1001,7 @@ test/patch_domain_config_response_test.dart
 test/patch_page_api_response_test.dart
 test/patch_sso_user_api_response_test.dart
 test/pending_comment_to_sync_outbound_test.dart
-test/post_remove_comment_response_test.dart
+test/post_remove_comment_api_response_test.dart
 test/pre_ban_summary_test.dart
 test/pub_sub_comment_base_test.dart
 test/pub_sub_comment_test.dart
diff --git a/client/README.md b/client/README.md
index 481c65e..0fdeef7 100644
--- a/client/README.md
+++ b/client/README.md
@@ -178,49 +178,49 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**updateTenantPackage**](doc//DefaultApi.md#updatetenantpackage) | **PATCH** /api/v1/tenant-packages/{id} | 
 *DefaultApi* | [**updateTenantUser**](doc//DefaultApi.md#updatetenantuser) | **PATCH** /api/v1/tenant-users/{id} | 
 *DefaultApi* | [**updateUserBadge**](doc//DefaultApi.md#updateuserbadge) | **PUT** /api/v1/user-badges/{id} | 
-*ModerationApi* | [**deleteModerationVote**](doc//ModerationApi.md#deletemoderationvote) | **DELETE** /auth/my-account/moderate-comments/vote/{commentId}/{voteId} | 
-*ModerationApi* | [**getApiComments**](doc//ModerationApi.md#getapicomments) | **GET** /auth/my-account/moderate-comments/api/comments | 
-*ModerationApi* | [**getApiExportStatus**](doc//ModerationApi.md#getapiexportstatus) | **GET** /auth/my-account/moderate-comments/api/export/status | 
-*ModerationApi* | [**getApiIds**](doc//ModerationApi.md#getapiids) | **GET** /auth/my-account/moderate-comments/api/ids | 
-*ModerationApi* | [**getBanUsersFromComment**](doc//ModerationApi.md#getbanusersfromcomment) | **GET** /auth/my-account/moderate-comments/ban-users/from-comment/{commentId} | 
-*ModerationApi* | [**getCommentBanStatus**](doc//ModerationApi.md#getcommentbanstatus) | **GET** /auth/my-account/moderate-comments/get-comment-ban-status/{commentId} | 
-*ModerationApi* | [**getCommentChildren**](doc//ModerationApi.md#getcommentchildren) | **GET** /auth/my-account/moderate-comments/comment-children/{commentId} | 
-*ModerationApi* | [**getCount**](doc//ModerationApi.md#getcount) | **GET** /auth/my-account/moderate-comments/count | 
-*ModerationApi* | [**getCounts**](doc//ModerationApi.md#getcounts) | **GET** /auth/my-account/moderate-comments/banned-users/counts | 
-*ModerationApi* | [**getLogs**](doc//ModerationApi.md#getlogs) | **GET** /auth/my-account/moderate-comments/logs/{commentId} | 
-*ModerationApi* | [**getManualBadges**](doc//ModerationApi.md#getmanualbadges) | **GET** /auth/my-account/moderate-comments/get-manual-badges | 
-*ModerationApi* | [**getManualBadgesForUser**](doc//ModerationApi.md#getmanualbadgesforuser) | **GET** /auth/my-account/moderate-comments/get-manual-badges-for-user | 
-*ModerationApi* | [**getModerationComment**](doc//ModerationApi.md#getmoderationcomment) | **GET** /auth/my-account/moderate-comments/comment/{commentId} | 
-*ModerationApi* | [**getModerationCommentText**](doc//ModerationApi.md#getmoderationcommenttext) | **GET** /auth/my-account/moderate-comments/get-comment-text/{commentId} | 
-*ModerationApi* | [**getPreBanSummary**](doc//ModerationApi.md#getprebansummary) | **GET** /auth/my-account/moderate-comments/pre-ban-summary/{commentId} | 
-*ModerationApi* | [**getSearchCommentsSummary**](doc//ModerationApi.md#getsearchcommentssummary) | **GET** /auth/my-account/moderate-comments/search/comments/summary | 
-*ModerationApi* | [**getSearchPages**](doc//ModerationApi.md#getsearchpages) | **GET** /auth/my-account/moderate-comments/search/pages | 
-*ModerationApi* | [**getSearchSites**](doc//ModerationApi.md#getsearchsites) | **GET** /auth/my-account/moderate-comments/search/sites | 
-*ModerationApi* | [**getSearchSuggest**](doc//ModerationApi.md#getsearchsuggest) | **GET** /auth/my-account/moderate-comments/search/suggest | 
-*ModerationApi* | [**getSearchUsers**](doc//ModerationApi.md#getsearchusers) | **GET** /auth/my-account/moderate-comments/search/users | 
-*ModerationApi* | [**getTrustFactor**](doc//ModerationApi.md#gettrustfactor) | **GET** /auth/my-account/moderate-comments/get-trust-factor | 
-*ModerationApi* | [**getUserBanPreference**](doc//ModerationApi.md#getuserbanpreference) | **GET** /auth/my-account/moderate-comments/user-ban-preference | 
-*ModerationApi* | [**getUserInternalProfile**](doc//ModerationApi.md#getuserinternalprofile) | **GET** /auth/my-account/moderate-comments/get-user-internal-profile | 
-*ModerationApi* | [**postAdjustCommentVotes**](doc//ModerationApi.md#postadjustcommentvotes) | **POST** /auth/my-account/moderate-comments/adjust-comment-votes/{commentId} | 
-*ModerationApi* | [**postApiExport**](doc//ModerationApi.md#postapiexport) | **POST** /auth/my-account/moderate-comments/api/export | 
-*ModerationApi* | [**postBanUserFromComment**](doc//ModerationApi.md#postbanuserfromcomment) | **POST** /auth/my-account/moderate-comments/ban-user/from-comment/{commentId} | 
-*ModerationApi* | [**postBanUserUndo**](doc//ModerationApi.md#postbanuserundo) | **POST** /auth/my-account/moderate-comments/ban-user/undo | 
-*ModerationApi* | [**postBulkPreBanSummary**](doc//ModerationApi.md#postbulkprebansummary) | **POST** /auth/my-account/moderate-comments/bulk-pre-ban-summary | 
-*ModerationApi* | [**postCommentsByIds**](doc//ModerationApi.md#postcommentsbyids) | **POST** /auth/my-account/moderate-comments/comments-by-ids | 
-*ModerationApi* | [**postFlagComment**](doc//ModerationApi.md#postflagcomment) | **POST** /auth/my-account/moderate-comments/flag-comment/{commentId} | 
-*ModerationApi* | [**postRemoveComment**](doc//ModerationApi.md#postremovecomment) | **POST** /auth/my-account/moderate-comments/remove-comment/{commentId} | 
-*ModerationApi* | [**postRestoreDeletedComment**](doc//ModerationApi.md#postrestoredeletedcomment) | **POST** /auth/my-account/moderate-comments/restore-deleted-comment/{commentId} | 
-*ModerationApi* | [**postSetCommentApprovalStatus**](doc//ModerationApi.md#postsetcommentapprovalstatus) | **POST** /auth/my-account/moderate-comments/set-comment-approval-status/{commentId} | 
-*ModerationApi* | [**postSetCommentReviewStatus**](doc//ModerationApi.md#postsetcommentreviewstatus) | **POST** /auth/my-account/moderate-comments/set-comment-review-status/{commentId} | 
-*ModerationApi* | [**postSetCommentSpamStatus**](doc//ModerationApi.md#postsetcommentspamstatus) | **POST** /auth/my-account/moderate-comments/set-comment-spam-status/{commentId} | 
-*ModerationApi* | [**postSetCommentText**](doc//ModerationApi.md#postsetcommenttext) | **POST** /auth/my-account/moderate-comments/set-comment-text/{commentId} | 
-*ModerationApi* | [**postUnFlagComment**](doc//ModerationApi.md#postunflagcomment) | **POST** /auth/my-account/moderate-comments/un-flag-comment/{commentId} | 
-*ModerationApi* | [**postVote**](doc//ModerationApi.md#postvote) | **POST** /auth/my-account/moderate-comments/vote/{commentId} | 
-*ModerationApi* | [**putAwardBadge**](doc//ModerationApi.md#putawardbadge) | **PUT** /auth/my-account/moderate-comments/award-badge | 
-*ModerationApi* | [**putCloseThread**](doc//ModerationApi.md#putclosethread) | **PUT** /auth/my-account/moderate-comments/close-thread | 
-*ModerationApi* | [**putRemoveBadge**](doc//ModerationApi.md#putremovebadge) | **PUT** /auth/my-account/moderate-comments/remove-badge | 
-*ModerationApi* | [**putReopenThread**](doc//ModerationApi.md#putreopenthread) | **PUT** /auth/my-account/moderate-comments/reopen-thread | 
-*ModerationApi* | [**setTrustFactor**](doc//ModerationApi.md#settrustfactor) | **PUT** /auth/my-account/moderate-comments/set-trust-factor | 
+*ModerationApi* | [**deleteModerationVote**](doc//ModerationApi.md#deletemoderationvote) | **DELETE** /auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId} | 
+*ModerationApi* | [**getApiComments**](doc//ModerationApi.md#getapicomments) | **GET** /auth/my-account/moderate-comments/mod_api/api/comments | 
+*ModerationApi* | [**getApiExportStatus**](doc//ModerationApi.md#getapiexportstatus) | **GET** /auth/my-account/moderate-comments/mod_api/api/export/status | 
+*ModerationApi* | [**getApiIds**](doc//ModerationApi.md#getapiids) | **GET** /auth/my-account/moderate-comments/mod_api/api/ids | 
+*ModerationApi* | [**getBanUsersFromComment**](doc//ModerationApi.md#getbanusersfromcomment) | **GET** /auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId} | 
+*ModerationApi* | [**getCommentBanStatus**](doc//ModerationApi.md#getcommentbanstatus) | **GET** /auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId} | 
+*ModerationApi* | [**getCommentChildren**](doc//ModerationApi.md#getcommentchildren) | **GET** /auth/my-account/moderate-comments/mod_api/comment-children/{commentId} | 
+*ModerationApi* | [**getCount**](doc//ModerationApi.md#getcount) | **GET** /auth/my-account/moderate-comments/mod_api/count | 
+*ModerationApi* | [**getCounts**](doc//ModerationApi.md#getcounts) | **GET** /auth/my-account/moderate-comments/banned-users/mod_api/counts | 
+*ModerationApi* | [**getLogs**](doc//ModerationApi.md#getlogs) | **GET** /auth/my-account/moderate-comments/mod_api/logs/{commentId} | 
+*ModerationApi* | [**getManualBadges**](doc//ModerationApi.md#getmanualbadges) | **GET** /auth/my-account/moderate-comments/mod_api/get-manual-badges | 
+*ModerationApi* | [**getManualBadgesForUser**](doc//ModerationApi.md#getmanualbadgesforuser) | **GET** /auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user | 
+*ModerationApi* | [**getModerationComment**](doc//ModerationApi.md#getmoderationcomment) | **GET** /auth/my-account/moderate-comments/mod_api/comment/{commentId} | 
+*ModerationApi* | [**getModerationCommentText**](doc//ModerationApi.md#getmoderationcommenttext) | **GET** /auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId} | 
+*ModerationApi* | [**getPreBanSummary**](doc//ModerationApi.md#getprebansummary) | **GET** /auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId} | 
+*ModerationApi* | [**getSearchCommentsSummary**](doc//ModerationApi.md#getsearchcommentssummary) | **GET** /auth/my-account/moderate-comments/mod_api/search/comments/summary | 
+*ModerationApi* | [**getSearchPages**](doc//ModerationApi.md#getsearchpages) | **GET** /auth/my-account/moderate-comments/mod_api/search/pages | 
+*ModerationApi* | [**getSearchSites**](doc//ModerationApi.md#getsearchsites) | **GET** /auth/my-account/moderate-comments/mod_api/search/sites | 
+*ModerationApi* | [**getSearchSuggest**](doc//ModerationApi.md#getsearchsuggest) | **GET** /auth/my-account/moderate-comments/mod_api/search/suggest | 
+*ModerationApi* | [**getSearchUsers**](doc//ModerationApi.md#getsearchusers) | **GET** /auth/my-account/moderate-comments/mod_api/search/users | 
+*ModerationApi* | [**getTrustFactor**](doc//ModerationApi.md#gettrustfactor) | **GET** /auth/my-account/moderate-comments/mod_api/get-trust-factor | 
+*ModerationApi* | [**getUserBanPreference**](doc//ModerationApi.md#getuserbanpreference) | **GET** /auth/my-account/moderate-comments/mod_api/user-ban-preference | 
+*ModerationApi* | [**getUserInternalProfile**](doc//ModerationApi.md#getuserinternalprofile) | **GET** /auth/my-account/moderate-comments/mod_api/get-user-internal-profile | 
+*ModerationApi* | [**postAdjustCommentVotes**](doc//ModerationApi.md#postadjustcommentvotes) | **POST** /auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId} | 
+*ModerationApi* | [**postApiExport**](doc//ModerationApi.md#postapiexport) | **POST** /auth/my-account/moderate-comments/mod_api/api/export | 
+*ModerationApi* | [**postBanUserFromComment**](doc//ModerationApi.md#postbanuserfromcomment) | **POST** /auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId} | 
+*ModerationApi* | [**postBanUserUndo**](doc//ModerationApi.md#postbanuserundo) | **POST** /auth/my-account/moderate-comments/mod_api/ban-user/undo | 
+*ModerationApi* | [**postBulkPreBanSummary**](doc//ModerationApi.md#postbulkprebansummary) | **POST** /auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary | 
+*ModerationApi* | [**postCommentsByIds**](doc//ModerationApi.md#postcommentsbyids) | **POST** /auth/my-account/moderate-comments/mod_api/comments-by-ids | 
+*ModerationApi* | [**postFlagComment**](doc//ModerationApi.md#postflagcomment) | **POST** /auth/my-account/moderate-comments/mod_api/flag-comment/{commentId} | 
+*ModerationApi* | [**postRemoveComment**](doc//ModerationApi.md#postremovecomment) | **POST** /auth/my-account/moderate-comments/mod_api/remove-comment/{commentId} | 
+*ModerationApi* | [**postRestoreDeletedComment**](doc//ModerationApi.md#postrestoredeletedcomment) | **POST** /auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId} | 
+*ModerationApi* | [**postSetCommentApprovalStatus**](doc//ModerationApi.md#postsetcommentapprovalstatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId} | 
+*ModerationApi* | [**postSetCommentReviewStatus**](doc//ModerationApi.md#postsetcommentreviewstatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId} | 
+*ModerationApi* | [**postSetCommentSpamStatus**](doc//ModerationApi.md#postsetcommentspamstatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId} | 
+*ModerationApi* | [**postSetCommentText**](doc//ModerationApi.md#postsetcommenttext) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId} | 
+*ModerationApi* | [**postUnFlagComment**](doc//ModerationApi.md#postunflagcomment) | **POST** /auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId} | 
+*ModerationApi* | [**postVote**](doc//ModerationApi.md#postvote) | **POST** /auth/my-account/moderate-comments/mod_api/vote/{commentId} | 
+*ModerationApi* | [**putAwardBadge**](doc//ModerationApi.md#putawardbadge) | **PUT** /auth/my-account/moderate-comments/mod_api/award-badge | 
+*ModerationApi* | [**putCloseThread**](doc//ModerationApi.md#putclosethread) | **PUT** /auth/my-account/moderate-comments/mod_api/close-thread | 
+*ModerationApi* | [**putRemoveBadge**](doc//ModerationApi.md#putremovebadge) | **PUT** /auth/my-account/moderate-comments/mod_api/remove-badge | 
+*ModerationApi* | [**putReopenThread**](doc//ModerationApi.md#putreopenthread) | **PUT** /auth/my-account/moderate-comments/mod_api/reopen-thread | 
+*ModerationApi* | [**setTrustFactor**](doc//ModerationApi.md#settrustfactor) | **PUT** /auth/my-account/moderate-comments/mod_api/set-trust-factor | 
 *PublicApi* | [**blockFromCommentPublic**](doc//PublicApi.md#blockfromcommentpublic) | **POST** /block-from-comment/{commentId} | 
 *PublicApi* | [**checkedCommentsForBlocked**](doc//PublicApi.md#checkedcommentsforblocked) | **GET** /check-blocked-comments | 
 *PublicApi* | [**createCommentPublic**](doc//PublicApi.md#createcommentpublic) | **POST** /comments/{tenantId} | 
@@ -536,7 +536,7 @@ Class | Method | HTTP request | Description
  - [PatchPageAPIResponse](doc//PatchPageAPIResponse.md)
  - [PatchSSOUserAPIResponse](doc//PatchSSOUserAPIResponse.md)
  - [PendingCommentToSyncOutbound](doc//PendingCommentToSyncOutbound.md)
- - [PostRemoveCommentResponse](doc//PostRemoveCommentResponse.md)
+ - [PostRemoveCommentApiResponse](doc//PostRemoveCommentApiResponse.md)
  - [PreBanSummary](doc//PreBanSummary.md)
  - [PubSubComment](doc//PubSubComment.md)
  - [PubSubCommentBase](doc//PubSubCommentBase.md)
diff --git a/client/doc/DefaultApi.md b/client/doc/DefaultApi.md
index 388747e..a7d496a 100644
--- a/client/doc/DefaultApi.md
+++ b/client/doc/DefaultApi.md
@@ -173,7 +173,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTag**
-> CreateHashTagResponse addHashTag(createHashTagBody, tenantId)
+> CreateHashTagResponse addHashTag(tenantId, createHashTagBody)
 
 
 
@@ -190,7 +190,7 @@ final tenantId = tenantId_example; // String |
 final createHashTagBody = CreateHashTagBody(); // CreateHashTagBody | 
 
 try {
-    final result = api_instance.addHashTag(createHashTagBody, tenantId);
+    final result = api_instance.addHashTag(tenantId, createHashTagBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTag: $e\n');
@@ -201,7 +201,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tenantId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | 
  **createHashTagBody** | [**CreateHashTagBody**](CreateHashTagBody.md)|  | [optional] 
 
 ### Return type
@@ -220,7 +220,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **addHashTagsBulk**
-> BulkCreateHashTagsResponse addHashTagsBulk(bulkCreateHashTagsBody, tenantId)
+> BulkCreateHashTagsResponse addHashTagsBulk(tenantId, bulkCreateHashTagsBody)
 
 
 
@@ -237,7 +237,7 @@ final tenantId = tenantId_example; // String |
 final bulkCreateHashTagsBody = BulkCreateHashTagsBody(); // BulkCreateHashTagsBody | 
 
 try {
-    final result = api_instance.addHashTagsBulk(bulkCreateHashTagsBody, tenantId);
+    final result = api_instance.addHashTagsBulk(tenantId, bulkCreateHashTagsBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->addHashTagsBulk: $e\n');
@@ -248,7 +248,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tenantId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | 
  **bulkCreateHashTagsBody** | [**BulkCreateHashTagsBody**](BulkCreateHashTagsBody.md)|  | [optional] 
 
 ### Return type
@@ -361,7 +361,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **aggregate**
-> AggregateResponse aggregate(tenantId, aggregationRequest, ApiAggregateOptions options)
+> AggregateResponse aggregate(tenantId, aggregationRequest, AggregateOptions options)
 
 
 
@@ -382,7 +382,7 @@ final parentTenantId = parentTenantId_example; // String |
 final includeStats = true; // bool | 
 
 try {
-    final result = api_instance.aggregate(tenantId, aggregationRequest, ApiAggregateOptions(parentTenantId: parentTenantId, includeStats: includeStats));
+    final result = api_instance.aggregate(tenantId, aggregationRequest, AggregateOptions(parentTenantId: parentTenantId, includeStats: includeStats));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->aggregate: $e\n');
@@ -414,7 +414,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **aggregateQuestionResults**
-> AggregateQuestionResultsResponse aggregateQuestionResults(tenantId, ApiAggregateQuestionResultsOptions options)
+> AggregateQuestionResultsResponse aggregateQuestionResults(tenantId, AggregateQuestionResultsOptions options)
 
 
 
@@ -436,7 +436,7 @@ final startDate = 2013-10-20T19:20:30+01:00; // DateTime |
 final forceRecalculate = true; // bool | 
 
 try {
-    final result = api_instance.aggregateQuestionResults(tenantId, ApiAggregateQuestionResultsOptions(questionId: questionId, questionIds: questionIds, urlId: urlId, timeBucket: timeBucket, startDate: startDate, forceRecalculate: forceRecalculate));
+    final result = api_instance.aggregateQuestionResults(tenantId, AggregateQuestionResultsOptions(questionId: questionId, questionIds: questionIds, urlId: urlId, timeBucket: timeBucket, startDate: startDate, forceRecalculate: forceRecalculate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->aggregateQuestionResults: $e\n');
@@ -471,7 +471,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **blockUserFromComment**
-> BlockSuccess blockUserFromComment(tenantId, id, blockFromCommentParams, ApiBlockUserFromCommentOptions options)
+> BlockSuccess blockUserFromComment(tenantId, id, blockFromCommentParams, BlockUserFromCommentOptions options)
 
 
 
@@ -491,7 +491,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.blockUserFromComment(tenantId, id, blockFromCommentParams, ApiBlockUserFromCommentOptions(userId: userId, anonUserId: anonUserId));
+    final result = api_instance.blockUserFromComment(tenantId, id, blockFromCommentParams, BlockUserFromCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->blockUserFromComment: $e\n');
@@ -624,7 +624,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **combineCommentsWithQuestionResults**
-> CombineQuestionResultsWithCommentsResponse combineCommentsWithQuestionResults(tenantId, ApiCombineCommentsWithQuestionResultsOptions options)
+> CombineQuestionResultsWithCommentsResponse combineCommentsWithQuestionResults(tenantId, CombineCommentsWithQuestionResultsOptions options)
 
 
 
@@ -648,7 +648,7 @@ final maxValue = 1.2; // double |
 final limit = 1.2; // double | 
 
 try {
-    final result = api_instance.combineCommentsWithQuestionResults(tenantId, ApiCombineCommentsWithQuestionResultsOptions(questionId: questionId, questionIds: questionIds, urlId: urlId, startDate: startDate, forceRecalculate: forceRecalculate, minValue: minValue, maxValue: maxValue, limit: limit));
+    final result = api_instance.combineCommentsWithQuestionResults(tenantId, CombineCommentsWithQuestionResultsOptions(questionId: questionId, questionIds: questionIds, urlId: urlId, startDate: startDate, forceRecalculate: forceRecalculate, minValue: minValue, maxValue: maxValue, limit: limit));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->combineCommentsWithQuestionResults: $e\n');
@@ -732,7 +732,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createFeedPost**
-> CreateFeedPostsResponse createFeedPost(tenantId, createFeedPostParams, ApiCreateFeedPostOptions options)
+> CreateFeedPostsResponse createFeedPost(tenantId, createFeedPostParams, CreateFeedPostOptions options)
 
 
 
@@ -753,7 +753,7 @@ final doSpamCheck = true; // bool |
 final skipDupCheck = true; // bool | 
 
 try {
-    final result = api_instance.createFeedPost(tenantId, createFeedPostParams, ApiCreateFeedPostOptions(broadcastId: broadcastId, isLive: isLive, doSpamCheck: doSpamCheck, skipDupCheck: skipDupCheck));
+    final result = api_instance.createFeedPost(tenantId, createFeedPostParams, CreateFeedPostOptions(broadcastId: broadcastId, isLive: isLive, doSpamCheck: doSpamCheck, skipDupCheck: skipDupCheck));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createFeedPost: $e\n');
@@ -1212,7 +1212,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createVote**
-> VoteResponse createVote(tenantId, commentId, direction, ApiCreateVoteOptions options)
+> VoteResponse createVote(tenantId, commentId, direction, CreateVoteOptions options)
 
 
 
@@ -1232,7 +1232,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.createVote(tenantId, commentId, direction, ApiCreateVoteOptions(userId: userId, anonUserId: anonUserId));
+    final result = api_instance.createVote(tenantId, commentId, direction, CreateVoteOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->createVote: $e\n');
@@ -1265,7 +1265,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteComment**
-> DeleteCommentResult deleteComment(tenantId, id, ApiDeleteCommentOptions options)
+> DeleteCommentResult deleteComment(tenantId, id, DeleteCommentOptions options)
 
 
 
@@ -1284,7 +1284,7 @@ final contextUserId = contextUserId_example; // String |
 final isLive = true; // bool | 
 
 try {
-    final result = api_instance.deleteComment(tenantId, id, ApiDeleteCommentOptions(contextUserId: contextUserId, isLive: isLive));
+    final result = api_instance.deleteComment(tenantId, id, DeleteCommentOptions(contextUserId: contextUserId, isLive: isLive));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteComment: $e\n');
@@ -1459,7 +1459,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteHashTag**
-> APIEmptyResponse deleteHashTag(tag, deleteHashTagRequestBody, tenantId)
+> APIEmptyResponse deleteHashTag(tenantId, tag, deleteHashTagRequestBody)
 
 
 
@@ -1472,12 +1472,12 @@ import 'package:fastcomments_dart/api.dart';
 //defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
 
 final api_instance = DefaultApi();
-final tag = tag_example; // String | 
 final tenantId = tenantId_example; // String | 
+final tag = tag_example; // String | 
 final deleteHashTagRequestBody = DeleteHashTagRequestBody(); // DeleteHashTagRequestBody | 
 
 try {
-    final result = api_instance.deleteHashTag(tag, deleteHashTagRequestBody, tenantId);
+    final result = api_instance.deleteHashTag(tenantId, tag, deleteHashTagRequestBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteHashTag: $e\n');
@@ -1488,8 +1488,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **tag** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **deleteHashTagRequestBody** | [**DeleteHashTagRequestBody**](DeleteHashTagRequestBody.md)|  | [optional] 
 
 ### Return type
@@ -1792,7 +1792,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteSSOUser**
-> DeleteSSOUserAPIResponse deleteSSOUser(tenantId, id, ApiDeleteSSOUserOptions options)
+> DeleteSSOUserAPIResponse deleteSSOUser(tenantId, id, DeleteSSOUserOptions options)
 
 
 
@@ -1811,7 +1811,7 @@ final deleteComments = true; // bool |
 final commentDeleteMode = commentDeleteMode_example; // String | 
 
 try {
-    final result = api_instance.deleteSSOUser(tenantId, id, ApiDeleteSSOUserOptions(deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
+    final result = api_instance.deleteSSOUser(tenantId, id, DeleteSSOUserOptions(deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteSSOUser: $e\n');
@@ -1988,7 +1988,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteTenantUser**
-> APIEmptyResponse deleteTenantUser(tenantId, id, ApiDeleteTenantUserOptions options)
+> APIEmptyResponse deleteTenantUser(tenantId, id, DeleteTenantUserOptions options)
 
 
 
@@ -2007,7 +2007,7 @@ final deleteComments = deleteComments_example; // String |
 final commentDeleteMode = commentDeleteMode_example; // String | 
 
 try {
-    final result = api_instance.deleteTenantUser(tenantId, id, ApiDeleteTenantUserOptions(deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
+    final result = api_instance.deleteTenantUser(tenantId, id, DeleteTenantUserOptions(deleteComments: deleteComments, commentDeleteMode: commentDeleteMode));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->deleteTenantUser: $e\n');
@@ -2135,7 +2135,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **flagComment**
-> FlagCommentResponse flagComment(tenantId, id, ApiFlagCommentOptions options)
+> FlagCommentResponse flagComment(tenantId, id, FlagCommentOptions options)
 
 
 
@@ -2154,7 +2154,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.flagComment(tenantId, id, ApiFlagCommentOptions(userId: userId, anonUserId: anonUserId));
+    final result = api_instance.flagComment(tenantId, id, FlagCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->flagComment: $e\n');
@@ -2186,7 +2186,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getAuditLogs**
-> GetAuditLogsResponse getAuditLogs(tenantId, ApiGetAuditLogsOptions options)
+> GetAuditLogsResponse getAuditLogs(tenantId, GetAuditLogsOptions options)
 
 
 
@@ -2207,7 +2207,7 @@ final after = 1.2; // double |
 final before = 1.2; // double | 
 
 try {
-    final result = api_instance.getAuditLogs(tenantId, ApiGetAuditLogsOptions(limit: limit, skip: skip, order: order, after: after, before: before));
+    final result = api_instance.getAuditLogs(tenantId, GetAuditLogsOptions(limit: limit, skip: skip, order: order, after: after, before: before));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getAuditLogs: $e\n');
@@ -2335,7 +2335,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getComments**
-> APIGetCommentsResponse getComments(tenantId, ApiGetCommentsOptions options)
+> APIGetCommentsResponse getComments(tenantId, GetCommentsOptions options)
 
 
 
@@ -2367,7 +2367,7 @@ final fromDate = 789; // int |
 final toDate = 789; // int | 
 
 try {
-    final result = api_instance.getComments(tenantId, ApiGetCommentsOptions(page: page, limit: limit, skip: skip, asTree: asTree, skipChildren: skipChildren, limitChildren: limitChildren, maxTreeDepth: maxTreeDepth, urlId: urlId, userId: userId, anonUserId: anonUserId, contextUserId: contextUserId, hashTag: hashTag, parentId: parentId, direction: direction, fromDate: fromDate, toDate: toDate));
+    final result = api_instance.getComments(tenantId, GetCommentsOptions(page: page, limit: limit, skip: skip, asTree: asTree, skipChildren: skipChildren, limitChildren: limitChildren, maxTreeDepth: maxTreeDepth, urlId: urlId, userId: userId, anonUserId: anonUserId, contextUserId: contextUserId, hashTag: hashTag, parentId: parentId, direction: direction, fromDate: fromDate, toDate: toDate));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getComments: $e\n');
@@ -2692,7 +2692,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPosts**
-> GetFeedPostsResponse getFeedPosts(tenantId, ApiGetFeedPostsOptions options)
+> GetFeedPostsResponse getFeedPosts(tenantId, GetFeedPostsOptions options)
 
 
 
@@ -2713,7 +2713,7 @@ final limit = 56; // int |
 final tags = []; // List<String> | 
 
 try {
-    final result = api_instance.getFeedPosts(tenantId, ApiGetFeedPostsOptions(afterId: afterId, limit: limit, tags: tags));
+    final result = api_instance.getFeedPosts(tenantId, GetFeedPostsOptions(afterId: afterId, limit: limit, tags: tags));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getFeedPosts: $e\n');
@@ -2886,7 +2886,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getNotificationCount**
-> GetNotificationCountResponse getNotificationCount(tenantId, ApiGetNotificationCountOptions options)
+> GetNotificationCountResponse getNotificationCount(tenantId, GetNotificationCountOptions options)
 
 
 
@@ -2907,7 +2907,7 @@ final viewed = true; // bool |
 final type = type_example; // String | 
 
 try {
-    final result = api_instance.getNotificationCount(tenantId, ApiGetNotificationCountOptions(userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type));
+    final result = api_instance.getNotificationCount(tenantId, GetNotificationCountOptions(userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getNotificationCount: $e\n');
@@ -2941,7 +2941,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getNotifications**
-> GetNotificationsResponse getNotifications(tenantId, ApiGetNotificationsOptions options)
+> GetNotificationsResponse getNotifications(tenantId, GetNotificationsOptions options)
 
 
 
@@ -2963,7 +2963,7 @@ final type = type_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getNotifications(tenantId, ApiGetNotificationsOptions(userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, skip: skip));
+    final result = api_instance.getNotifications(tenantId, GetNotificationsOptions(userId: userId, urlId: urlId, fromCommentId: fromCommentId, viewed: viewed, type: type, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getNotifications: $e\n');
@@ -3090,7 +3090,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPendingWebhookEventCount**
-> GetPendingWebhookEventCountResponse getPendingWebhookEventCount(tenantId, ApiGetPendingWebhookEventCountOptions options)
+> GetPendingWebhookEventCountResponse getPendingWebhookEventCount(tenantId, GetPendingWebhookEventCountOptions options)
 
 
 
@@ -3112,7 +3112,7 @@ final domain = domain_example; // String |
 final attemptCountGT = 1.2; // double | 
 
 try {
-    final result = api_instance.getPendingWebhookEventCount(tenantId, ApiGetPendingWebhookEventCountOptions(commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT));
+    final result = api_instance.getPendingWebhookEventCount(tenantId, GetPendingWebhookEventCountOptions(commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPendingWebhookEventCount: $e\n');
@@ -3147,7 +3147,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPendingWebhookEvents**
-> GetPendingWebhookEventsResponse getPendingWebhookEvents(tenantId, ApiGetPendingWebhookEventsOptions options)
+> GetPendingWebhookEventsResponse getPendingWebhookEvents(tenantId, GetPendingWebhookEventsOptions options)
 
 
 
@@ -3170,7 +3170,7 @@ final attemptCountGT = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getPendingWebhookEvents(tenantId, ApiGetPendingWebhookEventsOptions(commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, skip: skip));
+    final result = api_instance.getPendingWebhookEvents(tenantId, GetPendingWebhookEventsOptions(commentId: commentId, externalId: externalId, eventType: eventType, type: type, domain: domain, attemptCountGT: attemptCountGT, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getPendingWebhookEvents: $e\n');
@@ -3347,7 +3347,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getQuestionResults**
-> GetQuestionResultsResponse getQuestionResults(tenantId, ApiGetQuestionResultsOptions options)
+> GetQuestionResultsResponse getQuestionResults(tenantId, GetQuestionResultsOptions options)
 
 
 
@@ -3369,7 +3369,7 @@ final questionIds = questionIds_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getQuestionResults(tenantId, ApiGetQuestionResultsOptions(urlId: urlId, userId: userId, startDate: startDate, questionId: questionId, questionIds: questionIds, skip: skip));
+    final result = api_instance.getQuestionResults(tenantId, GetQuestionResultsOptions(urlId: urlId, userId: userId, startDate: startDate, questionId: questionId, questionIds: questionIds, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getQuestionResults: $e\n');
@@ -3639,7 +3639,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenantDailyUsages**
-> GetTenantDailyUsagesResponse getTenantDailyUsages(tenantId, ApiGetTenantDailyUsagesOptions options)
+> GetTenantDailyUsagesResponse getTenantDailyUsages(tenantId, GetTenantDailyUsagesOptions options)
 
 
 
@@ -3659,7 +3659,7 @@ final dayNumber = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenantDailyUsages(tenantId, ApiGetTenantDailyUsagesOptions(yearNumber: yearNumber, monthNumber: monthNumber, dayNumber: dayNumber, skip: skip));
+    final result = api_instance.getTenantDailyUsages(tenantId, GetTenantDailyUsagesOptions(yearNumber: yearNumber, monthNumber: monthNumber, dayNumber: dayNumber, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenantDailyUsages: $e\n');
@@ -3880,7 +3880,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTenants**
-> GetTenantsResponse getTenants(tenantId, ApiGetTenantsOptions options)
+> GetTenantsResponse getTenants(tenantId, GetTenantsOptions options)
 
 
 
@@ -3898,7 +3898,7 @@ final meta = meta_example; // String |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getTenants(tenantId, ApiGetTenantsOptions(meta: meta, skip: skip));
+    final result = api_instance.getTenants(tenantId, GetTenantsOptions(meta: meta, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTenants: $e\n');
@@ -3978,7 +3978,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTickets**
-> GetTicketsResponse getTickets(tenantId, ApiGetTicketsOptions options)
+> GetTicketsResponse getTickets(tenantId, GetTicketsOptions options)
 
 
 
@@ -3998,7 +3998,7 @@ final skip = 1.2; // double |
 final limit = 1.2; // double | 
 
 try {
-    final result = api_instance.getTickets(tenantId, ApiGetTicketsOptions(userId: userId, state: state, skip: skip, limit: limit));
+    final result = api_instance.getTickets(tenantId, GetTicketsOptions(userId: userId, state: state, skip: skip, limit: limit));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getTickets: $e\n');
@@ -4219,7 +4219,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadgeProgressList**
-> APIGetUserBadgeProgressListResponse getUserBadgeProgressList(tenantId, ApiGetUserBadgeProgressListOptions options)
+> APIGetUserBadgeProgressListResponse getUserBadgeProgressList(tenantId, GetUserBadgeProgressListOptions options)
 
 
 
@@ -4238,7 +4238,7 @@ final limit = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getUserBadgeProgressList(tenantId, ApiGetUserBadgeProgressListOptions(userId: userId, limit: limit, skip: skip));
+    final result = api_instance.getUserBadgeProgressList(tenantId, GetUserBadgeProgressListOptions(userId: userId, limit: limit, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadgeProgressList: $e\n');
@@ -4270,7 +4270,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBadges**
-> APIGetUserBadgesResponse getUserBadges(tenantId, ApiGetUserBadgesOptions options)
+> APIGetUserBadgesResponse getUserBadges(tenantId, GetUserBadgesOptions options)
 
 
 
@@ -4292,7 +4292,7 @@ final limit = 1.2; // double |
 final skip = 1.2; // double | 
 
 try {
-    final result = api_instance.getUserBadges(tenantId, ApiGetUserBadgesOptions(userId: userId, badgeId: badgeId, type: type, displayedOnComments: displayedOnComments, limit: limit, skip: skip));
+    final result = api_instance.getUserBadges(tenantId, GetUserBadgesOptions(userId: userId, badgeId: badgeId, type: type, displayedOnComments: displayedOnComments, limit: limit, skip: skip));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getUserBadges: $e\n');
@@ -4374,7 +4374,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getVotesForUser**
-> GetVotesForUserResponse getVotesForUser(tenantId, urlId, ApiGetVotesForUserOptions options)
+> GetVotesForUserResponse getVotesForUser(tenantId, urlId, GetVotesForUserOptions options)
 
 
 
@@ -4393,7 +4393,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.getVotesForUser(tenantId, urlId, ApiGetVotesForUserOptions(userId: userId, anonUserId: anonUserId));
+    final result = api_instance.getVotesForUser(tenantId, urlId, GetVotesForUserOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->getVotesForUser: $e\n');
@@ -4474,7 +4474,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **patchHashTag**
-> UpdateHashTagResponse patchHashTag(tag, updateHashTagBody, tenantId)
+> UpdateHashTagResponse patchHashTag(tenantId, tag, updateHashTagBody)
 
 
 
@@ -4487,12 +4487,12 @@ import 'package:fastcomments_dart/api.dart';
 //defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
 
 final api_instance = DefaultApi();
-final tag = tag_example; // String | 
 final tenantId = tenantId_example; // String | 
+final tag = tag_example; // String | 
 final updateHashTagBody = UpdateHashTagBody(); // UpdateHashTagBody | 
 
 try {
-    final result = api_instance.patchHashTag(tag, updateHashTagBody, tenantId);
+    final result = api_instance.patchHashTag(tenantId, tag, updateHashTagBody);
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->patchHashTag: $e\n');
@@ -4503,8 +4503,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **tag** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **updateHashTagBody** | [**UpdateHashTagBody**](UpdateHashTagBody.md)|  | [optional] 
 
 ### Return type
@@ -4872,7 +4872,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **saveComment**
-> APISaveCommentResponse saveComment(tenantId, createCommentParams, ApiSaveCommentOptions options)
+> APISaveCommentResponse saveComment(tenantId, createCommentParams, SaveCommentOptions options)
 
 
 
@@ -4893,7 +4893,7 @@ final sendEmails = true; // bool |
 final populateNotifications = true; // bool | 
 
 try {
-    final result = api_instance.saveComment(tenantId, createCommentParams, ApiSaveCommentOptions(isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
+    final result = api_instance.saveComment(tenantId, createCommentParams, SaveCommentOptions(isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->saveComment: $e\n');
@@ -4927,7 +4927,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **saveCommentsBulk**
-> List<SaveCommentsBulkResponse> saveCommentsBulk(tenantId, createCommentParams, ApiSaveCommentsBulkOptions options)
+> List<SaveCommentsBulkResponse> saveCommentsBulk(tenantId, createCommentParams, SaveCommentsBulkOptions options)
 
 
 
@@ -4948,7 +4948,7 @@ final sendEmails = true; // bool |
 final populateNotifications = true; // bool | 
 
 try {
-    final result = api_instance.saveCommentsBulk(tenantId, createCommentParams, ApiSaveCommentsBulkOptions(isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
+    final result = api_instance.saveCommentsBulk(tenantId, createCommentParams, SaveCommentsBulkOptions(isLive: isLive, doSpamCheck: doSpamCheck, sendEmails: sendEmails, populateNotifications: populateNotifications));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->saveCommentsBulk: $e\n');
@@ -5080,7 +5080,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unBlockUserFromComment**
-> UnblockSuccess unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, ApiUnBlockUserFromCommentOptions options)
+> UnblockSuccess unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, UnBlockUserFromCommentOptions options)
 
 
 
@@ -5100,7 +5100,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, ApiUnBlockUserFromCommentOptions(userId: userId, anonUserId: anonUserId));
+    final result = api_instance.unBlockUserFromComment(tenantId, id, unBlockFromCommentParams, UnBlockUserFromCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->unBlockUserFromComment: $e\n');
@@ -5133,7 +5133,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **unFlagComment**
-> FlagCommentResponse unFlagComment(tenantId, id, ApiUnFlagCommentOptions options)
+> FlagCommentResponse unFlagComment(tenantId, id, UnFlagCommentOptions options)
 
 
 
@@ -5152,7 +5152,7 @@ final userId = userId_example; // String |
 final anonUserId = anonUserId_example; // String | 
 
 try {
-    final result = api_instance.unFlagComment(tenantId, id, ApiUnFlagCommentOptions(userId: userId, anonUserId: anonUserId));
+    final result = api_instance.unFlagComment(tenantId, id, UnFlagCommentOptions(userId: userId, anonUserId: anonUserId));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->unFlagComment: $e\n');
@@ -5184,7 +5184,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateComment**
-> APIEmptyResponse updateComment(tenantId, id, updatableCommentParams, ApiUpdateCommentOptions options)
+> APIEmptyResponse updateComment(tenantId, id, updatableCommentParams, UpdateCommentOptions options)
 
 
 
@@ -5205,7 +5205,7 @@ final doSpamCheck = true; // bool |
 final isLive = true; // bool | 
 
 try {
-    final result = api_instance.updateComment(tenantId, id, updatableCommentParams, ApiUpdateCommentOptions(contextUserId: contextUserId, doSpamCheck: doSpamCheck, isLive: isLive));
+    final result = api_instance.updateComment(tenantId, id, updatableCommentParams, UpdateCommentOptions(contextUserId: contextUserId, doSpamCheck: doSpamCheck, isLive: isLive));
     print(result);
 } catch (e) {
     print('Exception when calling DefaultApi->updateComment: $e\n');
diff --git a/client/doc/ModerationApi.md b/client/doc/ModerationApi.md
index 7e79c04..de7dc61 100644
--- a/client/doc/ModerationApi.md
+++ b/client/doc/ModerationApi.md
@@ -9,53 +9,53 @@ All URIs are relative to *https://fastcomments.com*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**deleteModerationVote**](ModerationApi.md#deletemoderationvote) | **DELETE** /auth/my-account/moderate-comments/vote/{commentId}/{voteId} | 
-[**getApiComments**](ModerationApi.md#getapicomments) | **GET** /auth/my-account/moderate-comments/api/comments | 
-[**getApiExportStatus**](ModerationApi.md#getapiexportstatus) | **GET** /auth/my-account/moderate-comments/api/export/status | 
-[**getApiIds**](ModerationApi.md#getapiids) | **GET** /auth/my-account/moderate-comments/api/ids | 
-[**getBanUsersFromComment**](ModerationApi.md#getbanusersfromcomment) | **GET** /auth/my-account/moderate-comments/ban-users/from-comment/{commentId} | 
-[**getCommentBanStatus**](ModerationApi.md#getcommentbanstatus) | **GET** /auth/my-account/moderate-comments/get-comment-ban-status/{commentId} | 
-[**getCommentChildren**](ModerationApi.md#getcommentchildren) | **GET** /auth/my-account/moderate-comments/comment-children/{commentId} | 
-[**getCount**](ModerationApi.md#getcount) | **GET** /auth/my-account/moderate-comments/count | 
-[**getCounts**](ModerationApi.md#getcounts) | **GET** /auth/my-account/moderate-comments/banned-users/counts | 
-[**getLogs**](ModerationApi.md#getlogs) | **GET** /auth/my-account/moderate-comments/logs/{commentId} | 
-[**getManualBadges**](ModerationApi.md#getmanualbadges) | **GET** /auth/my-account/moderate-comments/get-manual-badges | 
-[**getManualBadgesForUser**](ModerationApi.md#getmanualbadgesforuser) | **GET** /auth/my-account/moderate-comments/get-manual-badges-for-user | 
-[**getModerationComment**](ModerationApi.md#getmoderationcomment) | **GET** /auth/my-account/moderate-comments/comment/{commentId} | 
-[**getModerationCommentText**](ModerationApi.md#getmoderationcommenttext) | **GET** /auth/my-account/moderate-comments/get-comment-text/{commentId} | 
-[**getPreBanSummary**](ModerationApi.md#getprebansummary) | **GET** /auth/my-account/moderate-comments/pre-ban-summary/{commentId} | 
-[**getSearchCommentsSummary**](ModerationApi.md#getsearchcommentssummary) | **GET** /auth/my-account/moderate-comments/search/comments/summary | 
-[**getSearchPages**](ModerationApi.md#getsearchpages) | **GET** /auth/my-account/moderate-comments/search/pages | 
-[**getSearchSites**](ModerationApi.md#getsearchsites) | **GET** /auth/my-account/moderate-comments/search/sites | 
-[**getSearchSuggest**](ModerationApi.md#getsearchsuggest) | **GET** /auth/my-account/moderate-comments/search/suggest | 
-[**getSearchUsers**](ModerationApi.md#getsearchusers) | **GET** /auth/my-account/moderate-comments/search/users | 
-[**getTrustFactor**](ModerationApi.md#gettrustfactor) | **GET** /auth/my-account/moderate-comments/get-trust-factor | 
-[**getUserBanPreference**](ModerationApi.md#getuserbanpreference) | **GET** /auth/my-account/moderate-comments/user-ban-preference | 
-[**getUserInternalProfile**](ModerationApi.md#getuserinternalprofile) | **GET** /auth/my-account/moderate-comments/get-user-internal-profile | 
-[**postAdjustCommentVotes**](ModerationApi.md#postadjustcommentvotes) | **POST** /auth/my-account/moderate-comments/adjust-comment-votes/{commentId} | 
-[**postApiExport**](ModerationApi.md#postapiexport) | **POST** /auth/my-account/moderate-comments/api/export | 
-[**postBanUserFromComment**](ModerationApi.md#postbanuserfromcomment) | **POST** /auth/my-account/moderate-comments/ban-user/from-comment/{commentId} | 
-[**postBanUserUndo**](ModerationApi.md#postbanuserundo) | **POST** /auth/my-account/moderate-comments/ban-user/undo | 
-[**postBulkPreBanSummary**](ModerationApi.md#postbulkprebansummary) | **POST** /auth/my-account/moderate-comments/bulk-pre-ban-summary | 
-[**postCommentsByIds**](ModerationApi.md#postcommentsbyids) | **POST** /auth/my-account/moderate-comments/comments-by-ids | 
-[**postFlagComment**](ModerationApi.md#postflagcomment) | **POST** /auth/my-account/moderate-comments/flag-comment/{commentId} | 
-[**postRemoveComment**](ModerationApi.md#postremovecomment) | **POST** /auth/my-account/moderate-comments/remove-comment/{commentId} | 
-[**postRestoreDeletedComment**](ModerationApi.md#postrestoredeletedcomment) | **POST** /auth/my-account/moderate-comments/restore-deleted-comment/{commentId} | 
-[**postSetCommentApprovalStatus**](ModerationApi.md#postsetcommentapprovalstatus) | **POST** /auth/my-account/moderate-comments/set-comment-approval-status/{commentId} | 
-[**postSetCommentReviewStatus**](ModerationApi.md#postsetcommentreviewstatus) | **POST** /auth/my-account/moderate-comments/set-comment-review-status/{commentId} | 
-[**postSetCommentSpamStatus**](ModerationApi.md#postsetcommentspamstatus) | **POST** /auth/my-account/moderate-comments/set-comment-spam-status/{commentId} | 
-[**postSetCommentText**](ModerationApi.md#postsetcommenttext) | **POST** /auth/my-account/moderate-comments/set-comment-text/{commentId} | 
-[**postUnFlagComment**](ModerationApi.md#postunflagcomment) | **POST** /auth/my-account/moderate-comments/un-flag-comment/{commentId} | 
-[**postVote**](ModerationApi.md#postvote) | **POST** /auth/my-account/moderate-comments/vote/{commentId} | 
-[**putAwardBadge**](ModerationApi.md#putawardbadge) | **PUT** /auth/my-account/moderate-comments/award-badge | 
-[**putCloseThread**](ModerationApi.md#putclosethread) | **PUT** /auth/my-account/moderate-comments/close-thread | 
-[**putRemoveBadge**](ModerationApi.md#putremovebadge) | **PUT** /auth/my-account/moderate-comments/remove-badge | 
-[**putReopenThread**](ModerationApi.md#putreopenthread) | **PUT** /auth/my-account/moderate-comments/reopen-thread | 
-[**setTrustFactor**](ModerationApi.md#settrustfactor) | **PUT** /auth/my-account/moderate-comments/set-trust-factor | 
+[**deleteModerationVote**](ModerationApi.md#deletemoderationvote) | **DELETE** /auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId} | 
+[**getApiComments**](ModerationApi.md#getapicomments) | **GET** /auth/my-account/moderate-comments/mod_api/api/comments | 
+[**getApiExportStatus**](ModerationApi.md#getapiexportstatus) | **GET** /auth/my-account/moderate-comments/mod_api/api/export/status | 
+[**getApiIds**](ModerationApi.md#getapiids) | **GET** /auth/my-account/moderate-comments/mod_api/api/ids | 
+[**getBanUsersFromComment**](ModerationApi.md#getbanusersfromcomment) | **GET** /auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId} | 
+[**getCommentBanStatus**](ModerationApi.md#getcommentbanstatus) | **GET** /auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId} | 
+[**getCommentChildren**](ModerationApi.md#getcommentchildren) | **GET** /auth/my-account/moderate-comments/mod_api/comment-children/{commentId} | 
+[**getCount**](ModerationApi.md#getcount) | **GET** /auth/my-account/moderate-comments/mod_api/count | 
+[**getCounts**](ModerationApi.md#getcounts) | **GET** /auth/my-account/moderate-comments/banned-users/mod_api/counts | 
+[**getLogs**](ModerationApi.md#getlogs) | **GET** /auth/my-account/moderate-comments/mod_api/logs/{commentId} | 
+[**getManualBadges**](ModerationApi.md#getmanualbadges) | **GET** /auth/my-account/moderate-comments/mod_api/get-manual-badges | 
+[**getManualBadgesForUser**](ModerationApi.md#getmanualbadgesforuser) | **GET** /auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user | 
+[**getModerationComment**](ModerationApi.md#getmoderationcomment) | **GET** /auth/my-account/moderate-comments/mod_api/comment/{commentId} | 
+[**getModerationCommentText**](ModerationApi.md#getmoderationcommenttext) | **GET** /auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId} | 
+[**getPreBanSummary**](ModerationApi.md#getprebansummary) | **GET** /auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId} | 
+[**getSearchCommentsSummary**](ModerationApi.md#getsearchcommentssummary) | **GET** /auth/my-account/moderate-comments/mod_api/search/comments/summary | 
+[**getSearchPages**](ModerationApi.md#getsearchpages) | **GET** /auth/my-account/moderate-comments/mod_api/search/pages | 
+[**getSearchSites**](ModerationApi.md#getsearchsites) | **GET** /auth/my-account/moderate-comments/mod_api/search/sites | 
+[**getSearchSuggest**](ModerationApi.md#getsearchsuggest) | **GET** /auth/my-account/moderate-comments/mod_api/search/suggest | 
+[**getSearchUsers**](ModerationApi.md#getsearchusers) | **GET** /auth/my-account/moderate-comments/mod_api/search/users | 
+[**getTrustFactor**](ModerationApi.md#gettrustfactor) | **GET** /auth/my-account/moderate-comments/mod_api/get-trust-factor | 
+[**getUserBanPreference**](ModerationApi.md#getuserbanpreference) | **GET** /auth/my-account/moderate-comments/mod_api/user-ban-preference | 
+[**getUserInternalProfile**](ModerationApi.md#getuserinternalprofile) | **GET** /auth/my-account/moderate-comments/mod_api/get-user-internal-profile | 
+[**postAdjustCommentVotes**](ModerationApi.md#postadjustcommentvotes) | **POST** /auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId} | 
+[**postApiExport**](ModerationApi.md#postapiexport) | **POST** /auth/my-account/moderate-comments/mod_api/api/export | 
+[**postBanUserFromComment**](ModerationApi.md#postbanuserfromcomment) | **POST** /auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId} | 
+[**postBanUserUndo**](ModerationApi.md#postbanuserundo) | **POST** /auth/my-account/moderate-comments/mod_api/ban-user/undo | 
+[**postBulkPreBanSummary**](ModerationApi.md#postbulkprebansummary) | **POST** /auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary | 
+[**postCommentsByIds**](ModerationApi.md#postcommentsbyids) | **POST** /auth/my-account/moderate-comments/mod_api/comments-by-ids | 
+[**postFlagComment**](ModerationApi.md#postflagcomment) | **POST** /auth/my-account/moderate-comments/mod_api/flag-comment/{commentId} | 
+[**postRemoveComment**](ModerationApi.md#postremovecomment) | **POST** /auth/my-account/moderate-comments/mod_api/remove-comment/{commentId} | 
+[**postRestoreDeletedComment**](ModerationApi.md#postrestoredeletedcomment) | **POST** /auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId} | 
+[**postSetCommentApprovalStatus**](ModerationApi.md#postsetcommentapprovalstatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId} | 
+[**postSetCommentReviewStatus**](ModerationApi.md#postsetcommentreviewstatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId} | 
+[**postSetCommentSpamStatus**](ModerationApi.md#postsetcommentspamstatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId} | 
+[**postSetCommentText**](ModerationApi.md#postsetcommenttext) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId} | 
+[**postUnFlagComment**](ModerationApi.md#postunflagcomment) | **POST** /auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId} | 
+[**postVote**](ModerationApi.md#postvote) | **POST** /auth/my-account/moderate-comments/mod_api/vote/{commentId} | 
+[**putAwardBadge**](ModerationApi.md#putawardbadge) | **PUT** /auth/my-account/moderate-comments/mod_api/award-badge | 
+[**putCloseThread**](ModerationApi.md#putclosethread) | **PUT** /auth/my-account/moderate-comments/mod_api/close-thread | 
+[**putRemoveBadge**](ModerationApi.md#putremovebadge) | **PUT** /auth/my-account/moderate-comments/mod_api/remove-badge | 
+[**putReopenThread**](ModerationApi.md#putreopenthread) | **PUT** /auth/my-account/moderate-comments/mod_api/reopen-thread | 
+[**setTrustFactor**](ModerationApi.md#settrustfactor) | **PUT** /auth/my-account/moderate-comments/mod_api/set-trust-factor | 
 
 
 # **deleteModerationVote**
-> VoteDeleteResponse deleteModerationVote(commentId, voteId, ApiDeleteModerationVoteOptions options)
+> VoteDeleteResponse deleteModerationVote(tenantId, commentId, voteId, DeleteModerationVoteOptions options)
 
 
 
@@ -64,14 +64,14 @@ Method | HTTP request | Description
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final voteId = voteId_example; // String | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteModerationVote(commentId, voteId, ApiDeleteModerationVoteOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.deleteModerationVote(tenantId, commentId, voteId, DeleteModerationVoteOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->deleteModerationVote: $e\n');
@@ -82,9 +82,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **voteId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -104,7 +104,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiComments**
-> ModerationAPIGetCommentsResponse getApiComments(ApiGetApiCommentsOptions options)
+> ModerationAPIGetCommentsResponse getApiComments(tenantId, GetApiCommentsOptions options)
 
 
 
@@ -113,6 +113,7 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final page = 1.2; // double | 
 final count = 1.2; // double | 
 final textSearch = textSearch_example; // String | 
@@ -121,11 +122,10 @@ final filters = filters_example; // String |
 final searchFilters = searchFilters_example; // String | 
 final sorts = sorts_example; // String | 
 final demo = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiComments(ApiGetApiCommentsOptions(page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, tenantId: tenantId, sso: sso));
+    final result = api_instance.getApiComments(tenantId, GetApiCommentsOptions(page: page, count: count, textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, demo: demo, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiComments: $e\n');
@@ -136,6 +136,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **page** | **double**|  | [optional] 
  **count** | **double**|  | [optional] 
  **textSearch** | **String**|  | [optional] 
@@ -144,7 +145,6 @@ Name | Type | Description  | Notes
  **searchFilters** | **String**|  | [optional] 
  **sorts** | **String**|  | [optional] 
  **demo** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -163,7 +163,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiExportStatus**
-> ModerationExportStatusResponse getApiExportStatus(ApiGetApiExportStatusOptions options)
+> ModerationExportStatusResponse getApiExportStatus(tenantId, GetApiExportStatusOptions options)
 
 
 
@@ -172,12 +172,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final batchJobId = batchJobId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final batchJobId = batchJobId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiExportStatus(ApiGetApiExportStatusOptions(batchJobId: batchJobId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getApiExportStatus(tenantId, GetApiExportStatusOptions(batchJobId: batchJobId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiExportStatus: $e\n');
@@ -188,8 +188,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **batchJobId** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -208,7 +208,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getApiIds**
-> ModerationAPIGetCommentIdsResponse getApiIds(ApiGetApiIdsOptions options)
+> ModerationAPIGetCommentIdsResponse getApiIds(tenantId, GetApiIdsOptions options)
 
 
 
@@ -217,17 +217,17 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final textSearch = textSearch_example; // String | 
 final byIPFromComment = byIPFromComment_example; // String | 
 final filters = filters_example; // String | 
 final searchFilters = searchFilters_example; // String | 
 final afterId = afterId_example; // String | 
 final demo = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getApiIds(ApiGetApiIdsOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, tenantId: tenantId, sso: sso));
+    final result = api_instance.getApiIds(tenantId, GetApiIdsOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, afterId: afterId, demo: demo, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getApiIds: $e\n');
@@ -238,13 +238,13 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **textSearch** | **String**|  | [optional] 
  **byIPFromComment** | **String**|  | [optional] 
  **filters** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
  **afterId** | **String**|  | [optional] 
  **demo** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -263,7 +263,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getBanUsersFromComment**
-> GetBannedUsersFromCommentResponse getBanUsersFromComment(commentId, ApiGetBanUsersFromCommentOptions options)
+> GetBannedUsersFromCommentResponse getBanUsersFromComment(tenantId, commentId, sso)
 
 
 
@@ -272,12 +272,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getBanUsersFromComment(commentId, ApiGetBanUsersFromCommentOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getBanUsersFromComment(tenantId, commentId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getBanUsersFromComment: $e\n');
@@ -288,8 +288,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -308,7 +308,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentBanStatus**
-> GetCommentBanStatusResponse getCommentBanStatus(commentId, ApiGetCommentBanStatusOptions options)
+> GetCommentBanStatusResponse getCommentBanStatus(tenantId, commentId, sso)
 
 
 
@@ -317,12 +317,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentBanStatus(commentId, ApiGetCommentBanStatusOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getCommentBanStatus(tenantId, commentId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentBanStatus: $e\n');
@@ -333,8 +333,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -353,7 +353,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentChildren**
-> ModerationAPIChildCommentsResponse getCommentChildren(commentId, ApiGetCommentChildrenOptions options)
+> ModerationAPIChildCommentsResponse getCommentChildren(tenantId, commentId, sso)
 
 
 
@@ -362,12 +362,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentChildren(commentId, ApiGetCommentChildrenOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getCommentChildren(tenantId, commentId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCommentChildren: $e\n');
@@ -378,8 +378,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -398,7 +398,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCount**
-> ModerationAPICountCommentsResponse getCount(ApiGetCountOptions options)
+> ModerationAPICountCommentsResponse getCount(tenantId, GetCountOptions options)
 
 
 
@@ -407,16 +407,16 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final textSearch = textSearch_example; // String | 
 final byIPFromComment = byIPFromComment_example; // String | 
 final filter = filter_example; // String | 
 final searchFilters = searchFilters_example; // String | 
 final demo = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCount(ApiGetCountOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, tenantId: tenantId, sso: sso));
+    final result = api_instance.getCount(tenantId, GetCountOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filter: filter, searchFilters: searchFilters, demo: demo, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCount: $e\n');
@@ -427,12 +427,12 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **textSearch** | **String**|  | [optional] 
  **byIPFromComment** | **String**|  | [optional] 
  **filter** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
  **demo** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -451,7 +451,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCounts**
-> GetBannedUsersCountResponse getCounts(ApiGetCountsOptions options)
+> GetBannedUsersCountResponse getCounts(tenantId, sso)
 
 
 
@@ -464,7 +464,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCounts(ApiGetCountsOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getCounts(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getCounts: $e\n');
@@ -475,7 +475,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tenantId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -494,7 +494,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getLogs**
-> ModerationAPIGetLogsResponse getLogs(commentId, ApiGetLogsOptions options)
+> ModerationAPIGetLogsResponse getLogs(tenantId, commentId, sso)
 
 
 
@@ -503,12 +503,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getLogs(commentId, ApiGetLogsOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getLogs(tenantId, commentId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getLogs: $e\n');
@@ -519,8 +519,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -539,7 +539,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadges**
-> GetTenantManualBadgesResponse getManualBadges(ApiGetManualBadgesOptions options)
+> GetTenantManualBadgesResponse getManualBadges(tenantId, sso)
 
 
 
@@ -552,7 +552,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadges(ApiGetManualBadgesOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getManualBadges(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadges: $e\n');
@@ -563,7 +563,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tenantId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -582,7 +582,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getManualBadgesForUser**
-> GetUserManualBadgesResponse getManualBadgesForUser(ApiGetManualBadgesForUserOptions options)
+> GetUserManualBadgesResponse getManualBadgesForUser(tenantId, GetManualBadgesForUserOptions options)
 
 
 
@@ -591,13 +591,13 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final badgesUserId = badgesUserId_example; // String | 
 final commentId = commentId_example; // String | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getManualBadgesForUser(ApiGetManualBadgesForUserOptions(badgesUserId: badgesUserId, commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getManualBadgesForUser(tenantId, GetManualBadgesForUserOptions(badgesUserId: badgesUserId, commentId: commentId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getManualBadgesForUser: $e\n');
@@ -608,9 +608,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **badgesUserId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -629,7 +629,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationComment**
-> ModerationAPICommentResponse getModerationComment(commentId, ApiGetModerationCommentOptions options)
+> ModerationAPICommentResponse getModerationComment(tenantId, commentId, GetModerationCommentOptions options)
 
 
 
@@ -638,14 +638,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final includeEmail = true; // bool | 
 final includeIP = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationComment(commentId, ApiGetModerationCommentOptions(includeEmail: includeEmail, includeIP: includeIP, tenantId: tenantId, sso: sso));
+    final result = api_instance.getModerationComment(tenantId, commentId, GetModerationCommentOptions(includeEmail: includeEmail, includeIP: includeIP, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationComment: $e\n');
@@ -656,10 +656,10 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **includeEmail** | **bool**|  | [optional] 
  **includeIP** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -678,7 +678,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getModerationCommentText**
-> GetCommentTextResponse getModerationCommentText(commentId, ApiGetModerationCommentTextOptions options)
+> GetCommentTextResponse getModerationCommentText(tenantId, commentId, sso)
 
 
 
@@ -687,12 +687,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getModerationCommentText(commentId, ApiGetModerationCommentTextOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getModerationCommentText(tenantId, commentId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getModerationCommentText: $e\n');
@@ -703,8 +703,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -723,7 +723,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPreBanSummary**
-> PreBanSummary getPreBanSummary(commentId, ApiGetPreBanSummaryOptions options)
+> PreBanSummary getPreBanSummary(tenantId, commentId, GetPreBanSummaryOptions options)
 
 
 
@@ -732,15 +732,15 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final includeByUserIdAndEmail = true; // bool | 
 final includeByIP = true; // bool | 
 final includeByEmailDomain = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getPreBanSummary(commentId, ApiGetPreBanSummaryOptions(includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
+    final result = api_instance.getPreBanSummary(tenantId, commentId, GetPreBanSummaryOptions(includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getPreBanSummary: $e\n');
@@ -751,11 +751,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **includeByUserIdAndEmail** | **bool**|  | [optional] 
  **includeByIP** | **bool**|  | [optional] 
  **includeByEmailDomain** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -774,7 +774,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchCommentsSummary**
-> ModerationCommentSearchResponse getSearchCommentsSummary(ApiGetSearchCommentsSummaryOptions options)
+> ModerationCommentSearchResponse getSearchCommentsSummary(tenantId, GetSearchCommentsSummaryOptions options)
 
 
 
@@ -783,14 +783,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final value = value_example; // String | 
 final filters = filters_example; // String | 
 final searchFilters = searchFilters_example; // String | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchCommentsSummary(ApiGetSearchCommentsSummaryOptions(value: value, filters: filters, searchFilters: searchFilters, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchCommentsSummary(tenantId, GetSearchCommentsSummaryOptions(value: value, filters: filters, searchFilters: searchFilters, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchCommentsSummary: $e\n');
@@ -801,10 +801,10 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **value** | **String**|  | [optional] 
  **filters** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -823,7 +823,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchPages**
-> ModerationPageSearchResponse getSearchPages(ApiGetSearchPagesOptions options)
+> ModerationPageSearchResponse getSearchPages(tenantId, GetSearchPagesOptions options)
 
 
 
@@ -832,12 +832,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final value = value_example; // String | 
 final tenantId = tenantId_example; // String | 
+final value = value_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchPages(ApiGetSearchPagesOptions(value: value, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchPages(tenantId, GetSearchPagesOptions(value: value, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchPages: $e\n');
@@ -848,8 +848,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **value** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -868,7 +868,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSites**
-> ModerationSiteSearchResponse getSearchSites(ApiGetSearchSitesOptions options)
+> ModerationSiteSearchResponse getSearchSites(tenantId, GetSearchSitesOptions options)
 
 
 
@@ -877,12 +877,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final value = value_example; // String | 
 final tenantId = tenantId_example; // String | 
+final value = value_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSites(ApiGetSearchSitesOptions(value: value, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchSites(tenantId, GetSearchSitesOptions(value: value, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSites: $e\n');
@@ -893,8 +893,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **value** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -913,7 +913,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchSuggest**
-> ModerationSuggestResponse getSearchSuggest(ApiGetSearchSuggestOptions options)
+> ModerationSuggestResponse getSearchSuggest(tenantId, GetSearchSuggestOptions options)
 
 
 
@@ -922,12 +922,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final textSearch = textSearch_example; // String | 
 final tenantId = tenantId_example; // String | 
+final textSearch = textSearch_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchSuggest(ApiGetSearchSuggestOptions(textSearch: textSearch, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchSuggest(tenantId, GetSearchSuggestOptions(textSearch: textSearch, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchSuggest: $e\n');
@@ -938,8 +938,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **textSearch** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -958,7 +958,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getSearchUsers**
-> ModerationUserSearchResponse getSearchUsers(ApiGetSearchUsersOptions options)
+> ModerationUserSearchResponse getSearchUsers(tenantId, GetSearchUsersOptions options)
 
 
 
@@ -967,12 +967,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final value = value_example; // String | 
 final tenantId = tenantId_example; // String | 
+final value = value_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getSearchUsers(ApiGetSearchUsersOptions(value: value, tenantId: tenantId, sso: sso));
+    final result = api_instance.getSearchUsers(tenantId, GetSearchUsersOptions(value: value, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getSearchUsers: $e\n');
@@ -983,8 +983,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **value** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1003,7 +1003,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTrustFactor**
-> GetUserTrustFactorResponse getTrustFactor(ApiGetTrustFactorOptions options)
+> GetUserTrustFactorResponse getTrustFactor(tenantId, GetTrustFactorOptions options)
 
 
 
@@ -1012,12 +1012,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final userId = userId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final userId = userId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getTrustFactor(ApiGetTrustFactorOptions(userId: userId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getTrustFactor(tenantId, GetTrustFactorOptions(userId: userId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getTrustFactor: $e\n');
@@ -1028,8 +1028,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **userId** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1048,7 +1048,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserBanPreference**
-> APIModerateGetUserBanPreferencesResponse getUserBanPreference(ApiGetUserBanPreferenceOptions options)
+> APIModerateGetUserBanPreferencesResponse getUserBanPreference(tenantId, sso)
 
 
 
@@ -1061,7 +1061,7 @@ final tenantId = tenantId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserBanPreference(ApiGetUserBanPreferenceOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.getUserBanPreference(tenantId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserBanPreference: $e\n');
@@ -1072,7 +1072,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tenantId** | **String**|  | [optional] 
+ **tenantId** | **String**|  | 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1091,7 +1091,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserInternalProfile**
-> GetUserInternalProfileResponse getUserInternalProfile(ApiGetUserInternalProfileOptions options)
+> GetUserInternalProfileResponse getUserInternalProfile(tenantId, GetUserInternalProfileOptions options)
 
 
 
@@ -1100,12 +1100,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserInternalProfile(ApiGetUserInternalProfileOptions(commentId: commentId, tenantId: tenantId, sso: sso));
+    final result = api_instance.getUserInternalProfile(tenantId, GetUserInternalProfileOptions(commentId: commentId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->getUserInternalProfile: $e\n');
@@ -1116,8 +1116,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1136,7 +1136,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postAdjustCommentVotes**
-> AdjustVotesResponse postAdjustCommentVotes(commentId, adjustCommentVotesParams, ApiPostAdjustCommentVotesOptions options)
+> AdjustVotesResponse postAdjustCommentVotes(tenantId, commentId, adjustCommentVotesParams, PostAdjustCommentVotesOptions options)
 
 
 
@@ -1145,14 +1145,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final adjustCommentVotesParams = AdjustCommentVotesParams(); // AdjustCommentVotesParams | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postAdjustCommentVotes(commentId, adjustCommentVotesParams, ApiPostAdjustCommentVotesOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postAdjustCommentVotes(tenantId, commentId, adjustCommentVotesParams, PostAdjustCommentVotesOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postAdjustCommentVotes: $e\n');
@@ -1163,9 +1163,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **adjustCommentVotesParams** | [**AdjustCommentVotesParams**](AdjustCommentVotesParams.md)|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1185,7 +1185,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postApiExport**
-> ModerationExportResponse postApiExport(ApiPostApiExportOptions options)
+> ModerationExportResponse postApiExport(tenantId, PostApiExportOptions options)
 
 
 
@@ -1194,16 +1194,16 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final textSearch = textSearch_example; // String | 
 final byIPFromComment = byIPFromComment_example; // String | 
 final filters = filters_example; // String | 
 final searchFilters = searchFilters_example; // String | 
 final sorts = sorts_example; // String | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postApiExport(ApiPostApiExportOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, tenantId: tenantId, sso: sso));
+    final result = api_instance.postApiExport(tenantId, PostApiExportOptions(textSearch: textSearch, byIPFromComment: byIPFromComment, filters: filters, searchFilters: searchFilters, sorts: sorts, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postApiExport: $e\n');
@@ -1214,12 +1214,12 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **textSearch** | **String**|  | [optional] 
  **byIPFromComment** | **String**|  | [optional] 
  **filters** | **String**|  | [optional] 
  **searchFilters** | **String**|  | [optional] 
  **sorts** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1238,7 +1238,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserFromComment**
-> BanUserFromCommentResult postBanUserFromComment(commentId, ApiPostBanUserFromCommentOptions options)
+> BanUserFromCommentResult postBanUserFromComment(tenantId, commentId, PostBanUserFromCommentOptions options)
 
 
 
@@ -1247,6 +1247,7 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final banEmail = true; // bool | 
 final banEmailDomain = true; // bool | 
@@ -1256,11 +1257,10 @@ final bannedUntil = bannedUntil_example; // String |
 final isShadowBan = true; // bool | 
 final updateId = updateId_example; // String | 
 final banReason = banReason_example; // String | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserFromComment(commentId, ApiPostBanUserFromCommentOptions(banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, tenantId: tenantId, sso: sso));
+    final result = api_instance.postBanUserFromComment(tenantId, commentId, PostBanUserFromCommentOptions(banEmail: banEmail, banEmailDomain: banEmailDomain, banIP: banIP, deleteAllUsersComments: deleteAllUsersComments, bannedUntil: bannedUntil, isShadowBan: isShadowBan, updateId: updateId, banReason: banReason, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserFromComment: $e\n');
@@ -1271,6 +1271,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **banEmail** | **bool**|  | [optional] 
  **banEmailDomain** | **bool**|  | [optional] 
@@ -1280,7 +1281,6 @@ Name | Type | Description  | Notes
  **isShadowBan** | **bool**|  | [optional] 
  **updateId** | **String**|  | [optional] 
  **banReason** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1299,7 +1299,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBanUserUndo**
-> APIEmptyResponse postBanUserUndo(banUserUndoParams, ApiPostBanUserUndoOptions options)
+> APIEmptyResponse postBanUserUndo(tenantId, banUserUndoParams, sso)
 
 
 
@@ -1308,12 +1308,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final banUserUndoParams = BanUserUndoParams(); // BanUserUndoParams | 
 final tenantId = tenantId_example; // String | 
+final banUserUndoParams = BanUserUndoParams(); // BanUserUndoParams | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBanUserUndo(banUserUndoParams, ApiPostBanUserUndoOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.postBanUserUndo(tenantId, banUserUndoParams, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBanUserUndo: $e\n');
@@ -1324,8 +1324,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **banUserUndoParams** | [**BanUserUndoParams**](BanUserUndoParams.md)|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1344,7 +1344,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postBulkPreBanSummary**
-> BulkPreBanSummary postBulkPreBanSummary(bulkPreBanParams, ApiPostBulkPreBanSummaryOptions options)
+> BulkPreBanSummary postBulkPreBanSummary(tenantId, bulkPreBanParams, PostBulkPreBanSummaryOptions options)
 
 
 
@@ -1353,15 +1353,15 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final bulkPreBanParams = BulkPreBanParams(); // BulkPreBanParams | 
 final includeByUserIdAndEmail = true; // bool | 
 final includeByIP = true; // bool | 
 final includeByEmailDomain = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postBulkPreBanSummary(bulkPreBanParams, ApiPostBulkPreBanSummaryOptions(includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, tenantId: tenantId, sso: sso));
+    final result = api_instance.postBulkPreBanSummary(tenantId, bulkPreBanParams, PostBulkPreBanSummaryOptions(includeByUserIdAndEmail: includeByUserIdAndEmail, includeByIP: includeByIP, includeByEmailDomain: includeByEmailDomain, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postBulkPreBanSummary: $e\n');
@@ -1372,11 +1372,11 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **bulkPreBanParams** | [**BulkPreBanParams**](BulkPreBanParams.md)|  | 
  **includeByUserIdAndEmail** | **bool**|  | [optional] 
  **includeByIP** | **bool**|  | [optional] 
  **includeByEmailDomain** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1395,7 +1395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postCommentsByIds**
-> ModerationAPIChildCommentsResponse postCommentsByIds(commentsByIdsParams, ApiPostCommentsByIdsOptions options)
+> ModerationAPIChildCommentsResponse postCommentsByIds(tenantId, commentsByIdsParams, sso)
 
 
 
@@ -1404,12 +1404,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentsByIdsParams = CommentsByIdsParams(); // CommentsByIdsParams | 
 final tenantId = tenantId_example; // String | 
+final commentsByIdsParams = CommentsByIdsParams(); // CommentsByIdsParams | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postCommentsByIds(commentsByIdsParams, ApiPostCommentsByIdsOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.postCommentsByIds(tenantId, commentsByIdsParams, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postCommentsByIds: $e\n');
@@ -1420,8 +1420,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentsByIdsParams** | [**CommentsByIdsParams**](CommentsByIdsParams.md)|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1440,7 +1440,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postFlagComment**
-> APIEmptyResponse postFlagComment(commentId, ApiPostFlagCommentOptions options)
+> APIEmptyResponse postFlagComment(tenantId, commentId, PostFlagCommentOptions options)
 
 
 
@@ -1449,13 +1449,13 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postFlagComment(commentId, ApiPostFlagCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postFlagComment(tenantId, commentId, PostFlagCommentOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postFlagComment: $e\n');
@@ -1466,8 +1466,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1487,7 +1487,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRemoveComment**
-> PostRemoveCommentResponse postRemoveComment(commentId, ApiPostRemoveCommentOptions options)
+> PostRemoveCommentApiResponse postRemoveComment(tenantId, commentId, PostRemoveCommentOptions options)
 
 
 
@@ -1496,13 +1496,13 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRemoveComment(commentId, ApiPostRemoveCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postRemoveComment(tenantId, commentId, PostRemoveCommentOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRemoveComment: $e\n');
@@ -1513,14 +1513,14 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
 
-[**PostRemoveCommentResponse**](PostRemoveCommentResponse.md)
+[**PostRemoveCommentApiResponse**](PostRemoveCommentApiResponse.md)
 
 ### Authorization
 
@@ -1534,7 +1534,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postRestoreDeletedComment**
-> APIEmptyResponse postRestoreDeletedComment(commentId, ApiPostRestoreDeletedCommentOptions options)
+> APIEmptyResponse postRestoreDeletedComment(tenantId, commentId, PostRestoreDeletedCommentOptions options)
 
 
 
@@ -1543,13 +1543,13 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postRestoreDeletedComment(commentId, ApiPostRestoreDeletedCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postRestoreDeletedComment(tenantId, commentId, PostRestoreDeletedCommentOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postRestoreDeletedComment: $e\n');
@@ -1560,8 +1560,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1581,7 +1581,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentApprovalStatus**
-> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, ApiPostSetCommentApprovalStatusOptions options)
+> SetCommentApprovedResponse postSetCommentApprovalStatus(tenantId, commentId, PostSetCommentApprovalStatusOptions options)
 
 
 
@@ -1590,14 +1590,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final approved = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentApprovalStatus(commentId, ApiPostSetCommentApprovalStatusOptions(approved: approved, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentApprovalStatus(tenantId, commentId, PostSetCommentApprovalStatusOptions(approved: approved, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentApprovalStatus: $e\n');
@@ -1608,9 +1608,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **approved** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1630,7 +1630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentReviewStatus**
-> APIEmptyResponse postSetCommentReviewStatus(commentId, ApiPostSetCommentReviewStatusOptions options)
+> APIEmptyResponse postSetCommentReviewStatus(tenantId, commentId, PostSetCommentReviewStatusOptions options)
 
 
 
@@ -1639,14 +1639,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final reviewed = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentReviewStatus(commentId, ApiPostSetCommentReviewStatusOptions(reviewed: reviewed, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentReviewStatus(tenantId, commentId, PostSetCommentReviewStatusOptions(reviewed: reviewed, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentReviewStatus: $e\n');
@@ -1657,9 +1657,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **reviewed** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1679,7 +1679,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentSpamStatus**
-> APIEmptyResponse postSetCommentSpamStatus(commentId, ApiPostSetCommentSpamStatusOptions options)
+> APIEmptyResponse postSetCommentSpamStatus(tenantId, commentId, PostSetCommentSpamStatusOptions options)
 
 
 
@@ -1688,15 +1688,15 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final spam = true; // bool | 
 final permNotSpam = true; // bool | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentSpamStatus(commentId, ApiPostSetCommentSpamStatusOptions(spam: spam, permNotSpam: permNotSpam, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentSpamStatus(tenantId, commentId, PostSetCommentSpamStatusOptions(spam: spam, permNotSpam: permNotSpam, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentSpamStatus: $e\n');
@@ -1707,10 +1707,10 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **spam** | **bool**|  | [optional] 
  **permNotSpam** | **bool**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1730,7 +1730,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postSetCommentText**
-> SetCommentTextResponse postSetCommentText(commentId, setCommentTextParams, ApiPostSetCommentTextOptions options)
+> SetCommentTextResponse postSetCommentText(tenantId, commentId, setCommentTextParams, PostSetCommentTextOptions options)
 
 
 
@@ -1739,14 +1739,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final setCommentTextParams = SetCommentTextParams(); // SetCommentTextParams | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postSetCommentText(commentId, setCommentTextParams, ApiPostSetCommentTextOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postSetCommentText(tenantId, commentId, setCommentTextParams, PostSetCommentTextOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postSetCommentText: $e\n');
@@ -1757,9 +1757,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **setCommentTextParams** | [**SetCommentTextParams**](SetCommentTextParams.md)|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1779,7 +1779,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postUnFlagComment**
-> APIEmptyResponse postUnFlagComment(commentId, ApiPostUnFlagCommentOptions options)
+> APIEmptyResponse postUnFlagComment(tenantId, commentId, PostUnFlagCommentOptions options)
 
 
 
@@ -1788,13 +1788,13 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final commentId = commentId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final commentId = commentId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postUnFlagComment(commentId, ApiPostUnFlagCommentOptions(tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postUnFlagComment(tenantId, commentId, PostUnFlagCommentOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postUnFlagComment: $e\n');
@@ -1805,8 +1805,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1826,7 +1826,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **postVote**
-> VoteResponse postVote(commentId, ApiPostVoteOptions options)
+> VoteResponse postVote(tenantId, commentId, PostVoteOptions options)
 
 
 
@@ -1835,14 +1835,14 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final commentId = commentId_example; // String | 
 final direction = direction_example; // String | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.postVote(commentId, ApiPostVoteOptions(direction: direction, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.postVote(tenantId, commentId, PostVoteOptions(direction: direction, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->postVote: $e\n');
@@ -1853,9 +1853,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **commentId** | **String**|  | 
  **direction** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1875,7 +1875,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putAwardBadge**
-> AwardUserBadgeResponse putAwardBadge(badgeId, ApiPutAwardBadgeOptions options)
+> AwardUserBadgeResponse putAwardBadge(tenantId, badgeId, PutAwardBadgeOptions options)
 
 
 
@@ -1884,15 +1884,15 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final badgeId = badgeId_example; // String | 
 final userId = userId_example; // String | 
 final commentId = commentId_example; // String | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putAwardBadge(badgeId, ApiPutAwardBadgeOptions(userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.putAwardBadge(tenantId, badgeId, PutAwardBadgeOptions(userId: userId, commentId: commentId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putAwardBadge: $e\n');
@@ -1903,10 +1903,10 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **badgeId** | **String**|  | 
  **userId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -1926,7 +1926,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putCloseThread**
-> APIEmptyResponse putCloseThread(urlId, ApiPutCloseThreadOptions options)
+> APIEmptyResponse putCloseThread(tenantId, urlId, sso)
 
 
 
@@ -1935,12 +1935,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final urlId = urlId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final urlId = urlId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putCloseThread(urlId, ApiPutCloseThreadOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.putCloseThread(tenantId, urlId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putCloseThread: $e\n');
@@ -1951,8 +1951,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **urlId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -1971,7 +1971,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putRemoveBadge**
-> RemoveUserBadgeResponse putRemoveBadge(badgeId, ApiPutRemoveBadgeOptions options)
+> RemoveUserBadgeResponse putRemoveBadge(tenantId, badgeId, PutRemoveBadgeOptions options)
 
 
 
@@ -1980,15 +1980,15 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final badgeId = badgeId_example; // String | 
 final userId = userId_example; // String | 
 final commentId = commentId_example; // String | 
-final tenantId = tenantId_example; // String | 
 final broadcastId = broadcastId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putRemoveBadge(badgeId, ApiPutRemoveBadgeOptions(userId: userId, commentId: commentId, tenantId: tenantId, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.putRemoveBadge(tenantId, badgeId, PutRemoveBadgeOptions(userId: userId, commentId: commentId, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putRemoveBadge: $e\n');
@@ -1999,10 +1999,10 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **badgeId** | **String**|  | 
  **userId** | **String**|  | [optional] 
  **commentId** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **broadcastId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
@@ -2022,7 +2022,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **putReopenThread**
-> APIEmptyResponse putReopenThread(urlId, ApiPutReopenThreadOptions options)
+> APIEmptyResponse putReopenThread(tenantId, urlId, sso)
 
 
 
@@ -2031,12 +2031,12 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
-final urlId = urlId_example; // String | 
 final tenantId = tenantId_example; // String | 
+final urlId = urlId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.putReopenThread(urlId, ApiPutReopenThreadOptions(tenantId: tenantId, sso: sso));
+    final result = api_instance.putReopenThread(tenantId, urlId, sso);
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->putReopenThread: $e\n');
@@ -2047,8 +2047,8 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **urlId** | **String**|  | 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
@@ -2067,7 +2067,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setTrustFactor**
-> SetUserTrustFactorResponse setTrustFactor(ApiSetTrustFactorOptions options)
+> SetUserTrustFactorResponse setTrustFactor(tenantId, SetTrustFactorOptions options)
 
 
 
@@ -2076,13 +2076,13 @@ No authorization required
 import 'package:fastcomments_dart/api.dart';
 
 final api_instance = ModerationApi();
+final tenantId = tenantId_example; // String | 
 final userId = userId_example; // String | 
 final trustFactor = trustFactor_example; // String | 
-final tenantId = tenantId_example; // String | 
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setTrustFactor(ApiSetTrustFactorOptions(userId: userId, trustFactor: trustFactor, tenantId: tenantId, sso: sso));
+    final result = api_instance.setTrustFactor(tenantId, SetTrustFactorOptions(userId: userId, trustFactor: trustFactor, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling ModerationApi->setTrustFactor: $e\n');
@@ -2093,9 +2093,9 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
+ **tenantId** | **String**|  | 
  **userId** | **String**|  | [optional] 
  **trustFactor** | **String**|  | [optional] 
- **tenantId** | **String**|  | [optional] 
  **sso** | **String**|  | [optional] 
 
 ### Return type
diff --git a/client/doc/PostRemoveCommentResponse.md b/client/doc/PostRemoveCommentApiResponse.md
similarity index 88%
rename from client/doc/PostRemoveCommentResponse.md
rename to client/doc/PostRemoveCommentApiResponse.md
index 20c632d..986597e 100644
--- a/client/doc/PostRemoveCommentResponse.md
+++ b/client/doc/PostRemoveCommentApiResponse.md
@@ -1,4 +1,4 @@
-# fastcomments_dart.model.PostRemoveCommentResponse
+# fastcomments_dart.model.PostRemoveCommentApiResponse
 
 ## Load the model package
 ```dart
diff --git a/client/doc/PublicApi.md b/client/doc/PublicApi.md
index a45ecdb..67fa277 100644
--- a/client/doc/PublicApi.md
+++ b/client/doc/PublicApi.md
@@ -156,7 +156,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createCommentPublic**
-> SaveCommentsResponseWithPresence createCommentPublic(tenantId, urlId, broadcastId, commentData, ApiCreateCommentPublicOptions options)
+> SaveCommentsResponseWithPresence createCommentPublic(tenantId, urlId, broadcastId, commentData, CreateCommentPublicOptions options)
 
 
 
@@ -173,7 +173,7 @@ final sessionId = sessionId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.createCommentPublic(tenantId, urlId, broadcastId, commentData, ApiCreateCommentPublicOptions(sessionId: sessionId, sso: sso));
+    final result = api_instance.createCommentPublic(tenantId, urlId, broadcastId, commentData, CreateCommentPublicOptions(sessionId: sessionId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createCommentPublic: $e\n');
@@ -207,7 +207,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createFeedPostPublic**
-> CreateFeedPostResponse createFeedPostPublic(tenantId, createFeedPostParams, ApiCreateFeedPostPublicOptions options)
+> CreateFeedPostResponse createFeedPostPublic(tenantId, createFeedPostParams, CreateFeedPostPublicOptions options)
 
 
 
@@ -222,7 +222,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.createFeedPostPublic(tenantId, createFeedPostParams, ApiCreateFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
+    final result = api_instance.createFeedPostPublic(tenantId, createFeedPostParams, CreateFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->createFeedPostPublic: $e\n');
@@ -346,7 +346,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteCommentPublic**
-> PublicAPIDeleteCommentResponse deleteCommentPublic(tenantId, commentId, broadcastId, ApiDeleteCommentPublicOptions options)
+> PublicAPIDeleteCommentResponse deleteCommentPublic(tenantId, commentId, broadcastId, DeleteCommentPublicOptions options)
 
 
 
@@ -362,7 +362,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteCommentPublic(tenantId, commentId, broadcastId, ApiDeleteCommentPublicOptions(editKey: editKey, sso: sso));
+    final result = api_instance.deleteCommentPublic(tenantId, commentId, broadcastId, DeleteCommentPublicOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteCommentPublic: $e\n');
@@ -395,7 +395,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteCommentVote**
-> VoteDeleteResponse deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, ApiDeleteCommentVoteOptions options)
+> VoteDeleteResponse deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, DeleteCommentVoteOptions options)
 
 
 
@@ -413,7 +413,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, ApiDeleteCommentVoteOptions(editKey: editKey, sso: sso));
+    final result = api_instance.deleteCommentVote(tenantId, commentId, voteId, urlId, broadcastId, DeleteCommentVoteOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteCommentVote: $e\n');
@@ -448,7 +448,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **deleteFeedPostPublic**
-> DeleteFeedPostPublicResponse deleteFeedPostPublic(tenantId, postId, ApiDeleteFeedPostPublicOptions options)
+> DeleteFeedPostPublicResponse deleteFeedPostPublic(tenantId, postId, DeleteFeedPostPublicOptions options)
 
 
 
@@ -463,7 +463,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.deleteFeedPostPublic(tenantId, postId, ApiDeleteFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
+    final result = api_instance.deleteFeedPostPublic(tenantId, postId, DeleteFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->deleteFeedPostPublic: $e\n');
@@ -630,7 +630,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentText**
-> PublicAPIGetCommentTextResponse getCommentText(tenantId, commentId, ApiGetCommentTextOptions options)
+> PublicAPIGetCommentTextResponse getCommentText(tenantId, commentId, GetCommentTextOptions options)
 
 
 
@@ -645,7 +645,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getCommentText(tenantId, commentId, ApiGetCommentTextOptions(editKey: editKey, sso: sso));
+    final result = api_instance.getCommentText(tenantId, commentId, GetCommentTextOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentText: $e\n');
@@ -724,7 +724,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentsForUser**
-> GetCommentsForUserResponse getCommentsForUser(ApiGetCommentsForUserOptions options)
+> GetCommentsForUserResponse getCommentsForUser(GetCommentsForUserOptions options)
 
 
 
@@ -742,7 +742,7 @@ final locale = locale_example; // String |
 final isCrawler = true; // bool | 
 
 try {
-    final result = api_instance.getCommentsForUser(ApiGetCommentsForUserOptions(userId: userId, direction: direction, repliesToUserId: repliesToUserId, page: page, includei10n: includei10n, locale: locale, isCrawler: isCrawler));
+    final result = api_instance.getCommentsForUser(GetCommentsForUserOptions(userId: userId, direction: direction, repliesToUserId: repliesToUserId, page: page, includei10n: includei10n, locale: locale, isCrawler: isCrawler));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentsForUser: $e\n');
@@ -777,7 +777,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getCommentsPublic**
-> GetCommentsResponseWithPresencePublicComment getCommentsPublic(tenantId, urlId, ApiGetCommentsPublicOptions options)
+> GetCommentsResponseWithPresencePublicComment getCommentsPublic(tenantId, urlId, GetCommentsPublicOptions options)
 
 
 
@@ -818,7 +818,7 @@ final afterCommentId = afterCommentId_example; // String |
 final beforeCommentId = beforeCommentId_example; // String | 
 
 try {
-    final result = api_instance.getCommentsPublic(tenantId, urlId, ApiGetCommentsPublicOptions(page: page, direction: direction, sso: sso, skip: skip, skipChildren: skipChildren, limit: limit, limitChildren: limitChildren, countChildren: countChildren, fetchPageForCommentId: fetchPageForCommentId, includeConfig: includeConfig, countAll: countAll, includei10n: includei10n, locale: locale, modules: modules, isCrawler: isCrawler, includeNotificationCount: includeNotificationCount, asTree: asTree, maxTreeDepth: maxTreeDepth, useFullTranslationIds: useFullTranslationIds, parentId: parentId, searchText: searchText, hashTags: hashTags, userId: userId, customConfigStr: customConfigStr, afterCommentId: afterCommentId, beforeCommentId: beforeCommentId));
+    final result = api_instance.getCommentsPublic(tenantId, urlId, GetCommentsPublicOptions(page: page, direction: direction, sso: sso, skip: skip, skipChildren: skipChildren, limit: limit, limitChildren: limitChildren, countChildren: countChildren, fetchPageForCommentId: fetchPageForCommentId, includeConfig: includeConfig, countAll: countAll, includei10n: includei10n, locale: locale, modules: modules, isCrawler: isCrawler, includeNotificationCount: includeNotificationCount, asTree: asTree, maxTreeDepth: maxTreeDepth, useFullTranslationIds: useFullTranslationIds, parentId: parentId, searchText: searchText, hashTags: hashTags, userId: userId, customConfigStr: customConfigStr, afterCommentId: afterCommentId, beforeCommentId: beforeCommentId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getCommentsPublic: $e\n');
@@ -925,7 +925,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getFeedPostsPublic**
-> PublicFeedPostsResponse getFeedPostsPublic(tenantId, ApiGetFeedPostsPublicOptions options)
+> PublicFeedPostsResponse getFeedPostsPublic(tenantId, GetFeedPostsPublicOptions options)
 
 
 
@@ -945,7 +945,7 @@ final isCrawler = true; // bool |
 final includeUserInfo = true; // bool | 
 
 try {
-    final result = api_instance.getFeedPostsPublic(tenantId, ApiGetFeedPostsPublicOptions(afterId: afterId, limit: limit, tags: tags, sso: sso, isCrawler: isCrawler, includeUserInfo: includeUserInfo));
+    final result = api_instance.getFeedPostsPublic(tenantId, GetFeedPostsPublicOptions(afterId: afterId, limit: limit, tags: tags, sso: sso, isCrawler: isCrawler, includeUserInfo: includeUserInfo));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getFeedPostsPublic: $e\n');
@@ -1068,7 +1068,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifsSearch**
-> GetGifsSearchResponse getGifsSearch(tenantId, search, ApiGetGifsSearchOptions options)
+> GetGifsSearchResponse getGifsSearch(tenantId, search, GetGifsSearchOptions options)
 
 
 
@@ -1084,7 +1084,7 @@ final rating = rating_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getGifsSearch(tenantId, search, ApiGetGifsSearchOptions(locale: locale, rating: rating, page: page));
+    final result = api_instance.getGifsSearch(tenantId, search, GetGifsSearchOptions(locale: locale, rating: rating, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifsSearch: $e\n');
@@ -1117,7 +1117,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getGifsTrending**
-> GetGifsTrendingResponse getGifsTrending(tenantId, ApiGetGifsTrendingOptions options)
+> GetGifsTrendingResponse getGifsTrending(tenantId, GetGifsTrendingOptions options)
 
 
 
@@ -1132,7 +1132,7 @@ final rating = rating_example; // String |
 final page = 1.2; // double | 
 
 try {
-    final result = api_instance.getGifsTrending(tenantId, ApiGetGifsTrendingOptions(locale: locale, rating: rating, page: page));
+    final result = api_instance.getGifsTrending(tenantId, GetGifsTrendingOptions(locale: locale, rating: rating, page: page));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getGifsTrending: $e\n');
@@ -1215,7 +1215,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getOfflineUsers**
-> PageUsersOfflineResponse getOfflineUsers(tenantId, urlId, ApiGetOfflineUsersOptions options)
+> PageUsersOfflineResponse getOfflineUsers(tenantId, urlId, GetOfflineUsersOptions options)
 
 
 
@@ -1232,7 +1232,7 @@ final afterName = afterName_example; // String | Cursor: pass nextAfterName from
 final afterUserId = afterUserId_example; // String | Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
 
 try {
-    final result = api_instance.getOfflineUsers(tenantId, urlId, ApiGetOfflineUsersOptions(afterName: afterName, afterUserId: afterUserId));
+    final result = api_instance.getOfflineUsers(tenantId, urlId, GetOfflineUsersOptions(afterName: afterName, afterUserId: afterUserId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getOfflineUsers: $e\n');
@@ -1264,7 +1264,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getOnlineUsers**
-> PageUsersOnlineResponse getOnlineUsers(tenantId, urlId, ApiGetOnlineUsersOptions options)
+> PageUsersOnlineResponse getOnlineUsers(tenantId, urlId, GetOnlineUsersOptions options)
 
 
 
@@ -1281,7 +1281,7 @@ final afterName = afterName_example; // String | Cursor: pass nextAfterName from
 final afterUserId = afterUserId_example; // String | Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
 
 try {
-    final result = api_instance.getOnlineUsers(tenantId, urlId, ApiGetOnlineUsersOptions(afterName: afterName, afterUserId: afterUserId));
+    final result = api_instance.getOnlineUsers(tenantId, urlId, GetOnlineUsersOptions(afterName: afterName, afterUserId: afterUserId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getOnlineUsers: $e\n');
@@ -1313,7 +1313,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getPagesPublic**
-> GetPublicPagesResponse getPagesPublic(tenantId, ApiGetPagesPublicOptions options)
+> GetPublicPagesResponse getPagesPublic(tenantId, GetPagesPublicOptions options)
 
 
 
@@ -1332,7 +1332,7 @@ final sortBy = ; // PagesSortBy | Sort order. `updatedAt` (default, newest first
 final hasComments = true; // bool | If true, only return pages with at least one comment.
 
 try {
-    final result = api_instance.getPagesPublic(tenantId, ApiGetPagesPublicOptions(cursor: cursor, limit: limit, q: q, sortBy: sortBy, hasComments: hasComments));
+    final result = api_instance.getPagesPublic(tenantId, GetPagesPublicOptions(cursor: cursor, limit: limit, q: q, sortBy: sortBy, hasComments: hasComments));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getPagesPublic: $e\n');
@@ -1366,7 +1366,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getTranslations**
-> GetTranslationsResponse getTranslations(namespace, component, ApiGetTranslationsOptions options)
+> GetTranslationsResponse getTranslations(namespace, component, GetTranslationsOptions options)
 
 
 
@@ -1381,7 +1381,7 @@ final locale = locale_example; // String |
 final useFullTranslationIds = true; // bool | 
 
 try {
-    final result = api_instance.getTranslations(namespace, component, ApiGetTranslationsOptions(locale: locale, useFullTranslationIds: useFullTranslationIds));
+    final result = api_instance.getTranslations(namespace, component, GetTranslationsOptions(locale: locale, useFullTranslationIds: useFullTranslationIds));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getTranslations: $e\n');
@@ -1456,7 +1456,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserNotifications**
-> GetMyNotificationsResponse getUserNotifications(tenantId, ApiGetUserNotificationsOptions options)
+> GetMyNotificationsResponse getUserNotifications(tenantId, GetUserNotificationsOptions options)
 
 
 
@@ -1479,7 +1479,7 @@ final includeTenantNotifications = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserNotifications(tenantId, ApiGetUserNotificationsOptions(urlId: urlId, pageSize: pageSize, afterId: afterId, includeContext: includeContext, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, includeTranslations: includeTranslations, includeTenantNotifications: includeTenantNotifications, sso: sso));
+    final result = api_instance.getUserNotifications(tenantId, GetUserNotificationsOptions(urlId: urlId, pageSize: pageSize, afterId: afterId, includeContext: includeContext, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, includeTranslations: includeTranslations, includeTenantNotifications: includeTenantNotifications, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserNotifications: $e\n');
@@ -1564,7 +1564,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **getUserReactsPublic**
-> UserReactsResponse getUserReactsPublic(tenantId, ApiGetUserReactsPublicOptions options)
+> UserReactsResponse getUserReactsPublic(tenantId, GetUserReactsPublicOptions options)
 
 
 
@@ -1578,7 +1578,7 @@ final postIds = []; // List<String> |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.getUserReactsPublic(tenantId, ApiGetUserReactsPublicOptions(postIds: postIds, sso: sso));
+    final result = api_instance.getUserReactsPublic(tenantId, GetUserReactsPublicOptions(postIds: postIds, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->getUserReactsPublic: $e\n');
@@ -1916,7 +1916,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **reactFeedPostPublic**
-> ReactFeedPostResponse reactFeedPostPublic(tenantId, postId, reactBodyParams, ApiReactFeedPostPublicOptions options)
+> ReactFeedPostResponse reactFeedPostPublic(tenantId, postId, reactBodyParams, ReactFeedPostPublicOptions options)
 
 
 
@@ -1933,7 +1933,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.reactFeedPostPublic(tenantId, postId, reactBodyParams, ApiReactFeedPostPublicOptions(isUndo: isUndo, broadcastId: broadcastId, sso: sso));
+    final result = api_instance.reactFeedPostPublic(tenantId, postId, reactBodyParams, ReactFeedPostPublicOptions(isUndo: isUndo, broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->reactFeedPostPublic: $e\n');
@@ -2010,7 +2010,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **resetUserNotifications**
-> ResetUserNotificationsResponse resetUserNotifications(tenantId, ApiResetUserNotificationsOptions options)
+> ResetUserNotificationsResponse resetUserNotifications(tenantId, ResetUserNotificationsOptions options)
 
 
 
@@ -2028,7 +2028,7 @@ final noDm = true; // bool |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.resetUserNotifications(tenantId, ApiResetUserNotificationsOptions(afterId: afterId, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, sso: sso));
+    final result = api_instance.resetUserNotifications(tenantId, ResetUserNotificationsOptions(afterId: afterId, afterCreatedAt: afterCreatedAt, unreadOnly: unreadOnly, dmOnly: dmOnly, noDm: noDm, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->resetUserNotifications: $e\n');
@@ -2063,7 +2063,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **searchUsers**
-> SearchUsersResult searchUsers(tenantId, urlId, ApiSearchUsersOptions options)
+> SearchUsersResult searchUsers(tenantId, urlId, SearchUsersOptions options)
 
 
 
@@ -2080,7 +2080,7 @@ final sso = sso_example; // String |
 final searchSection = searchSection_example; // String | 
 
 try {
-    final result = api_instance.searchUsers(tenantId, urlId, ApiSearchUsersOptions(usernameStartsWith: usernameStartsWith, mentionGroupIds: mentionGroupIds, sso: sso, searchSection: searchSection));
+    final result = api_instance.searchUsers(tenantId, urlId, SearchUsersOptions(usernameStartsWith: usernameStartsWith, mentionGroupIds: mentionGroupIds, sso: sso, searchSection: searchSection));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->searchUsers: $e\n');
@@ -2114,7 +2114,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **setCommentText**
-> PublicAPISetCommentTextResponse setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, ApiSetCommentTextOptions options)
+> PublicAPISetCommentTextResponse setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, SetCommentTextOptions options)
 
 
 
@@ -2131,7 +2131,7 @@ final editKey = editKey_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, ApiSetCommentTextOptions(editKey: editKey, sso: sso));
+    final result = api_instance.setCommentText(tenantId, commentId, broadcastId, commentTextUpdateRequest, SetCommentTextOptions(editKey: editKey, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->setCommentText: $e\n');
@@ -2306,7 +2306,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateFeedPostPublic**
-> CreateFeedPostResponse updateFeedPostPublic(tenantId, postId, updateFeedPostParams, ApiUpdateFeedPostPublicOptions options)
+> CreateFeedPostResponse updateFeedPostPublic(tenantId, postId, updateFeedPostParams, UpdateFeedPostPublicOptions options)
 
 
 
@@ -2322,7 +2322,7 @@ final broadcastId = broadcastId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.updateFeedPostPublic(tenantId, postId, updateFeedPostParams, ApiUpdateFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
+    final result = api_instance.updateFeedPostPublic(tenantId, postId, updateFeedPostParams, UpdateFeedPostPublicOptions(broadcastId: broadcastId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->updateFeedPostPublic: $e\n');
@@ -2506,7 +2506,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **uploadImage**
-> UploadImageResponse uploadImage(tenantId, file, ApiUploadImageOptions options)
+> UploadImageResponse uploadImage(tenantId, file, UploadImageOptions options)
 
 
 
@@ -2523,7 +2523,7 @@ final sizePreset = ; // SizePreset | Size preset: \"Default\" (1000x1000px) or \
 final urlId = urlId_example; // String | Page id that upload is happening from, to configure
 
 try {
-    final result = api_instance.uploadImage(tenantId, file, ApiUploadImageOptions(sizePreset: sizePreset, urlId: urlId));
+    final result = api_instance.uploadImage(tenantId, file, UploadImageOptions(sizePreset: sizePreset, urlId: urlId));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->uploadImage: $e\n');
@@ -2555,7 +2555,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **voteComment**
-> VoteResponse voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, ApiVoteCommentOptions options)
+> VoteResponse voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, VoteCommentOptions options)
 
 
 
@@ -2573,7 +2573,7 @@ final sessionId = sessionId_example; // String |
 final sso = sso_example; // String | 
 
 try {
-    final result = api_instance.voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, ApiVoteCommentOptions(sessionId: sessionId, sso: sso));
+    final result = api_instance.voteComment(tenantId, commentId, urlId, broadcastId, voteBodyParams, VoteCommentOptions(sessionId: sessionId, sso: sso));
     print(result);
 } catch (e) {
     print('Exception when calling PublicApi->voteComment: $e\n');
diff --git a/client/lib/api.dart b/client/lib/api.dart
index 27757e2..1c03d2a 100644
--- a/client/lib/api.dart
+++ b/client/lib/api.dart
@@ -291,7 +291,7 @@ part 'model/patch_domain_config_response.dart';
 part 'model/patch_page_api_response.dart';
 part 'model/patch_sso_user_api_response.dart';
 part 'model/pending_comment_to_sync_outbound.dart';
-part 'model/post_remove_comment_response.dart';
+part 'model/post_remove_comment_api_response.dart';
 part 'model/pre_ban_summary.dart';
 part 'model/pub_sub_comment.dart';
 part 'model/pub_sub_comment_base.dart';
diff --git a/client/lib/api/default_api.dart b/client/lib/api/default_api.dart
index 0e7ad0b..fdfb1ae 100644
--- a/client/lib/api/default_api.dart
+++ b/client/lib/api/default_api.dart
@@ -72,10 +72,10 @@ class DefaultApi {
   /// Performs an HTTP 'POST /api/v1/hash-tags' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<Response> addHashTagWithHttpInfo(CreateHashTagBody createHashTagBody, [ String? tenantId ]) async {
+  Future<Response> addHashTagWithHttpInfo(String tenantId, CreateHashTagBody createHashTagBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags';
 
@@ -86,9 +86,7 @@ class DefaultApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
 
     const contentTypes = <String>['application/json'];
 
@@ -106,11 +104,11 @@ class DefaultApi {
 
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [CreateHashTagBody] createHashTagBody:
-  Future<CreateHashTagResponse?> addHashTag(CreateHashTagBody createHashTagBody, [ String? tenantId ]) async {
-    final response = await addHashTagWithHttpInfo(createHashTagBody, tenantId);
+  Future<CreateHashTagResponse?> addHashTag(String tenantId, CreateHashTagBody createHashTagBody) async {
+    final response = await addHashTagWithHttpInfo(tenantId, createHashTagBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -127,10 +125,10 @@ class DefaultApi {
   /// Performs an HTTP 'POST /api/v1/hash-tags/bulk' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<Response> addHashTagsBulkWithHttpInfo(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId ]) async {
+  Future<Response> addHashTagsBulkWithHttpInfo(String tenantId, BulkCreateHashTagsBody bulkCreateHashTagsBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/bulk';
 
@@ -141,9 +139,7 @@ class DefaultApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
 
     const contentTypes = <String>['application/json'];
 
@@ -161,11 +157,11 @@ class DefaultApi {
 
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [BulkCreateHashTagsBody] bulkCreateHashTagsBody:
-  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(BulkCreateHashTagsBody bulkCreateHashTagsBody, [ String? tenantId ]) async {
-    final response = await addHashTagsBulkWithHttpInfo(bulkCreateHashTagsBody, tenantId);
+  Future<BulkCreateHashTagsResponse?> addHashTagsBulk(String tenantId, BulkCreateHashTagsBody bulkCreateHashTagsBody) async {
+    final response = await addHashTagsBulkWithHttpInfo(tenantId, bulkCreateHashTagsBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -298,7 +294,7 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<Response> aggregateWithHttpInfo(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options ]) async {
+  Future<Response> aggregateWithHttpInfo(String tenantId, AggregationRequest aggregationRequest, [ AggregateOptions? options ]) async {
     final parentTenantId = options?.parentTenantId;
     final includeStats = options?.includeStats;
     // ignore: prefer_const_declarations
@@ -344,7 +340,7 @@ class DefaultApi {
   /// * [String] parentTenantId:
   ///
   /// * [bool] includeStats:
-  Future<AggregateResponse?> aggregate(String tenantId, AggregationRequest aggregationRequest, [ ApiAggregateOptions? options ]) async {
+  Future<AggregateResponse?> aggregate(String tenantId, AggregationRequest aggregationRequest, [ AggregateOptions? options ]) async {
     final response = await aggregateWithHttpInfo(tenantId, aggregationRequest, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -375,7 +371,7 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<Response> aggregateQuestionResultsWithHttpInfo(String tenantId, [ ApiAggregateQuestionResultsOptions? options ]) async {
+  Future<Response> aggregateQuestionResultsWithHttpInfo(String tenantId, [ AggregateQuestionResultsOptions? options ]) async {
     final questionId = options?.questionId;
     final questionIds = options?.questionIds;
     final urlId = options?.urlId;
@@ -441,7 +437,7 @@ class DefaultApi {
   /// * [DateTime] startDate:
   ///
   /// * [bool] forceRecalculate:
-  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(String tenantId, [ ApiAggregateQuestionResultsOptions? options ]) async {
+  Future<AggregateQuestionResultsResponse?> aggregateQuestionResults(String tenantId, [ AggregateQuestionResultsOptions? options ]) async {
     final response = await aggregateQuestionResultsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -468,7 +464,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> blockUserFromCommentWithHttpInfo(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options ]) async {
+  Future<Response> blockUserFromCommentWithHttpInfo(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ BlockUserFromCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -515,7 +511,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<BlockSuccess?> blockUserFromComment(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ ApiBlockUserFromCommentOptions? options ]) async {
+  Future<BlockSuccess?> blockUserFromComment(String tenantId, String id, BlockFromCommentParams blockFromCommentParams, [ BlockUserFromCommentOptions? options ]) async {
     final response = await blockUserFromCommentWithHttpInfo(tenantId, id, blockFromCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -673,7 +669,7 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options ]) async {
+  Future<Response> combineCommentsWithQuestionResultsWithHttpInfo(String tenantId, [ CombineCommentsWithQuestionResultsOptions? options ]) async {
     final questionId = options?.questionId;
     final questionIds = options?.questionIds;
     final urlId = options?.urlId;
@@ -751,7 +747,7 @@ class DefaultApi {
   /// * [double] maxValue:
   ///
   /// * [double] limit:
-  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(String tenantId, [ ApiCombineCommentsWithQuestionResultsOptions? options ]) async {
+  Future<CombineQuestionResultsWithCommentsResponse?> combineCommentsWithQuestionResults(String tenantId, [ CombineCommentsWithQuestionResultsOptions? options ]) async {
     final response = await combineCommentsWithQuestionResultsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -833,7 +829,7 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<Response> createFeedPostWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options ]) async {
+  Future<Response> createFeedPostWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ CreateFeedPostOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final isLive = options?.isLive;
     final doSpamCheck = options?.doSpamCheck;
@@ -889,7 +885,7 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] skipDupCheck:
-  Future<CreateFeedPostsResponse?> createFeedPost(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostOptions? options ]) async {
+  Future<CreateFeedPostsResponse?> createFeedPost(String tenantId, CreateFeedPostParams createFeedPostParams, [ CreateFeedPostOptions? options ]) async {
     final response = await createFeedPostWithHttpInfo(tenantId, createFeedPostParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1398,7 +1394,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> createVoteWithHttpInfo(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options ]) async {
+  Future<Response> createVoteWithHttpInfo(String tenantId, String commentId, String direction, [ CreateVoteOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -1446,7 +1442,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<VoteResponse?> createVote(String tenantId, String commentId, String direction, [ ApiCreateVoteOptions? options ]) async {
+  Future<VoteResponse?> createVote(String tenantId, String commentId, String direction, [ CreateVoteOptions? options ]) async {
     final response = await createVoteWithHttpInfo(tenantId, commentId, direction, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1471,7 +1467,7 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<Response> deleteCommentWithHttpInfo(String tenantId, String id, [ ApiDeleteCommentOptions? options ]) async {
+  Future<Response> deleteCommentWithHttpInfo(String tenantId, String id, [ DeleteCommentOptions? options ]) async {
     final contextUserId = options?.contextUserId;
     final isLive = options?.isLive;
     // ignore: prefer_const_declarations
@@ -1516,7 +1512,7 @@ class DefaultApi {
   /// * [String] contextUserId:
   ///
   /// * [bool] isLive:
-  Future<DeleteCommentResult?> deleteComment(String tenantId, String id, [ ApiDeleteCommentOptions? options ]) async {
+  Future<DeleteCommentResult?> deleteComment(String tenantId, String id, [ DeleteCommentOptions? options ]) async {
     final response = await deleteCommentWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1701,12 +1697,12 @@ class DefaultApi {
   /// Performs an HTTP 'DELETE /api/v1/hash-tags/{tag}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tag (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] tag (required):
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<Response> deleteHashTagWithHttpInfo(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId ]) async {
+  Future<Response> deleteHashTagWithHttpInfo(String tenantId, String tag, DeleteHashTagRequestBody deleteHashTagRequestBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -1718,9 +1714,7 @@ class DefaultApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
 
     const contentTypes = <String>['application/json'];
 
@@ -1738,13 +1732,13 @@ class DefaultApi {
 
   /// Parameters:
   ///
-  /// * [String] tag (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] tag (required):
   ///
   /// * [DeleteHashTagRequestBody] deleteHashTagRequestBody:
-  Future<APIEmptyResponse?> deleteHashTag(String tag, DeleteHashTagRequestBody deleteHashTagRequestBody, [ String? tenantId ]) async {
-    final response = await deleteHashTagWithHttpInfo(tag, deleteHashTagRequestBody, tenantId);
+  Future<APIEmptyResponse?> deleteHashTag(String tenantId, String tag, DeleteHashTagRequestBody deleteHashTagRequestBody) async {
+    final response = await deleteHashTagWithHttpInfo(tenantId, tag, deleteHashTagRequestBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2099,7 +2093,7 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteSSOUserWithHttpInfo(String tenantId, String id, [ ApiDeleteSSOUserOptions? options ]) async {
+  Future<Response> deleteSSOUserWithHttpInfo(String tenantId, String id, [ DeleteSSOUserOptions? options ]) async {
     final deleteComments = options?.deleteComments;
     final commentDeleteMode = options?.commentDeleteMode;
     // ignore: prefer_const_declarations
@@ -2144,7 +2138,7 @@ class DefaultApi {
   /// * [bool] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(String tenantId, String id, [ ApiDeleteSSOUserOptions? options ]) async {
+  Future<DeleteSSOUserAPIResponse?> deleteSSOUser(String tenantId, String id, [ DeleteSSOUserOptions? options ]) async {
     final response = await deleteSSOUserWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2345,7 +2339,7 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<Response> deleteTenantUserWithHttpInfo(String tenantId, String id, [ ApiDeleteTenantUserOptions? options ]) async {
+  Future<Response> deleteTenantUserWithHttpInfo(String tenantId, String id, [ DeleteTenantUserOptions? options ]) async {
     final deleteComments = options?.deleteComments;
     final commentDeleteMode = options?.commentDeleteMode;
     // ignore: prefer_const_declarations
@@ -2390,7 +2384,7 @@ class DefaultApi {
   /// * [String] deleteComments:
   ///
   /// * [String] commentDeleteMode:
-  Future<APIEmptyResponse?> deleteTenantUser(String tenantId, String id, [ ApiDeleteTenantUserOptions? options ]) async {
+  Future<APIEmptyResponse?> deleteTenantUser(String tenantId, String id, [ DeleteTenantUserOptions? options ]) async {
     final response = await deleteTenantUserWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2530,7 +2524,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> flagCommentWithHttpInfo(String tenantId, String id, [ ApiFlagCommentOptions? options ]) async {
+  Future<Response> flagCommentWithHttpInfo(String tenantId, String id, [ FlagCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -2575,7 +2569,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> flagComment(String tenantId, String id, [ ApiFlagCommentOptions? options ]) async {
+  Future<FlagCommentResponse?> flagComment(String tenantId, String id, [ FlagCommentOptions? options ]) async {
     final response = await flagCommentWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2604,7 +2598,7 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<Response> getAuditLogsWithHttpInfo(String tenantId, [ ApiGetAuditLogsOptions? options ]) async {
+  Future<Response> getAuditLogsWithHttpInfo(String tenantId, [ GetAuditLogsOptions? options ]) async {
     final limit = options?.limit;
     final skip = options?.skip;
     final order = options?.order;
@@ -2664,7 +2658,7 @@ class DefaultApi {
   /// * [double] after:
   ///
   /// * [double] before:
-  Future<GetAuditLogsResponse?> getAuditLogs(String tenantId, [ ApiGetAuditLogsOptions? options ]) async {
+  Future<GetAuditLogsResponse?> getAuditLogs(String tenantId, [ GetAuditLogsOptions? options ]) async {
     final response = await getAuditLogsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2823,7 +2817,7 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<Response> getCommentsWithHttpInfo(String tenantId, [ ApiGetCommentsOptions? options ]) async {
+  Future<Response> getCommentsWithHttpInfo(String tenantId, [ GetCommentsOptions? options ]) async {
     final page = options?.page;
     final limit = options?.limit;
     final skip = options?.skip;
@@ -2949,7 +2943,7 @@ class DefaultApi {
   /// * [int] fromDate:
   ///
   /// * [int] toDate:
-  Future<APIGetCommentsResponse?> getComments(String tenantId, [ ApiGetCommentsOptions? options ]) async {
+  Future<APIGetCommentsResponse?> getComments(String tenantId, [ GetCommentsOptions? options ]) async {
     final response = await getCommentsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3300,7 +3294,7 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<Response> getFeedPostsWithHttpInfo(String tenantId, [ ApiGetFeedPostsOptions? options ]) async {
+  Future<Response> getFeedPostsWithHttpInfo(String tenantId, [ GetFeedPostsOptions? options ]) async {
     final afterId = options?.afterId;
     final limit = options?.limit;
     final tags = options?.tags;
@@ -3350,7 +3344,7 @@ class DefaultApi {
   /// * [int] limit:
   ///
   /// * [List<String>] tags:
-  Future<GetFeedPostsResponse?> getFeedPosts(String tenantId, [ ApiGetFeedPostsOptions? options ]) async {
+  Future<GetFeedPostsResponse?> getFeedPosts(String tenantId, [ GetFeedPostsOptions? options ]) async {
     final response = await getFeedPostsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3545,7 +3539,7 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<Response> getNotificationCountWithHttpInfo(String tenantId, [ ApiGetNotificationCountOptions? options ]) async {
+  Future<Response> getNotificationCountWithHttpInfo(String tenantId, [ GetNotificationCountOptions? options ]) async {
     final userId = options?.userId;
     final urlId = options?.urlId;
     final fromCommentId = options?.fromCommentId;
@@ -3605,7 +3599,7 @@ class DefaultApi {
   /// * [bool] viewed:
   ///
   /// * [String] type:
-  Future<GetNotificationCountResponse?> getNotificationCount(String tenantId, [ ApiGetNotificationCountOptions? options ]) async {
+  Future<GetNotificationCountResponse?> getNotificationCount(String tenantId, [ GetNotificationCountOptions? options ]) async {
     final response = await getNotificationCountWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3636,7 +3630,7 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<Response> getNotificationsWithHttpInfo(String tenantId, [ ApiGetNotificationsOptions? options ]) async {
+  Future<Response> getNotificationsWithHttpInfo(String tenantId, [ GetNotificationsOptions? options ]) async {
     final userId = options?.userId;
     final urlId = options?.urlId;
     final fromCommentId = options?.fromCommentId;
@@ -3702,7 +3696,7 @@ class DefaultApi {
   /// * [String] type:
   ///
   /// * [double] skip:
-  Future<GetNotificationsResponse?> getNotifications(String tenantId, [ ApiGetNotificationsOptions? options ]) async {
+  Future<GetNotificationsResponse?> getNotifications(String tenantId, [ GetNotificationsOptions? options ]) async {
     final response = await getNotificationsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3836,7 +3830,7 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<Response> getPendingWebhookEventCountWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options ]) async {
+  Future<Response> getPendingWebhookEventCountWithHttpInfo(String tenantId, [ GetPendingWebhookEventCountOptions? options ]) async {
     final commentId = options?.commentId;
     final externalId = options?.externalId;
     final eventType = options?.eventType;
@@ -3902,7 +3896,7 @@ class DefaultApi {
   /// * [String] domain:
   ///
   /// * [double] attemptCountGT:
-  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(String tenantId, [ ApiGetPendingWebhookEventCountOptions? options ]) async {
+  Future<GetPendingWebhookEventCountResponse?> getPendingWebhookEventCount(String tenantId, [ GetPendingWebhookEventCountOptions? options ]) async {
     final response = await getPendingWebhookEventCountWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3935,7 +3929,7 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<Response> getPendingWebhookEventsWithHttpInfo(String tenantId, [ ApiGetPendingWebhookEventsOptions? options ]) async {
+  Future<Response> getPendingWebhookEventsWithHttpInfo(String tenantId, [ GetPendingWebhookEventsOptions? options ]) async {
     final commentId = options?.commentId;
     final externalId = options?.externalId;
     final eventType = options?.eventType;
@@ -4007,7 +4001,7 @@ class DefaultApi {
   /// * [double] attemptCountGT:
   ///
   /// * [double] skip:
-  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(String tenantId, [ ApiGetPendingWebhookEventsOptions? options ]) async {
+  Future<GetPendingWebhookEventsResponse?> getPendingWebhookEvents(String tenantId, [ GetPendingWebhookEventsOptions? options ]) async {
     final response = await getPendingWebhookEventsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -4202,7 +4196,7 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<Response> getQuestionResultsWithHttpInfo(String tenantId, [ ApiGetQuestionResultsOptions? options ]) async {
+  Future<Response> getQuestionResultsWithHttpInfo(String tenantId, [ GetQuestionResultsOptions? options ]) async {
     final urlId = options?.urlId;
     final userId = options?.userId;
     final startDate = options?.startDate;
@@ -4268,7 +4262,7 @@ class DefaultApi {
   /// * [String] questionIds:
   ///
   /// * [double] skip:
-  Future<GetQuestionResultsResponse?> getQuestionResults(String tenantId, [ ApiGetQuestionResultsOptions? options ]) async {
+  Future<GetQuestionResultsResponse?> getQuestionResults(String tenantId, [ GetQuestionResultsOptions? options ]) async {
     final response = await getQuestionResultsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -4569,7 +4563,7 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<Response> getTenantDailyUsagesWithHttpInfo(String tenantId, [ ApiGetTenantDailyUsagesOptions? options ]) async {
+  Future<Response> getTenantDailyUsagesWithHttpInfo(String tenantId, [ GetTenantDailyUsagesOptions? options ]) async {
     final yearNumber = options?.yearNumber;
     final monthNumber = options?.monthNumber;
     final dayNumber = options?.dayNumber;
@@ -4623,7 +4617,7 @@ class DefaultApi {
   /// * [double] dayNumber:
   ///
   /// * [double] skip:
-  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(String tenantId, [ ApiGetTenantDailyUsagesOptions? options ]) async {
+  Future<GetTenantDailyUsagesResponse?> getTenantDailyUsages(String tenantId, [ GetTenantDailyUsagesOptions? options ]) async {
     final response = await getTenantDailyUsagesWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -4866,7 +4860,7 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<Response> getTenantsWithHttpInfo(String tenantId, [ ApiGetTenantsOptions? options ]) async {
+  Future<Response> getTenantsWithHttpInfo(String tenantId, [ GetTenantsOptions? options ]) async {
     final meta = options?.meta;
     final skip = options?.skip;
     // ignore: prefer_const_declarations
@@ -4908,7 +4902,7 @@ class DefaultApi {
   /// * [String] meta:
   ///
   /// * [double] skip:
-  Future<GetTenantsResponse?> getTenants(String tenantId, [ ApiGetTenantsOptions? options ]) async {
+  Future<GetTenantsResponse?> getTenants(String tenantId, [ GetTenantsOptions? options ]) async {
     final response = await getTenantsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -4996,7 +4990,7 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<Response> getTicketsWithHttpInfo(String tenantId, [ ApiGetTicketsOptions? options ]) async {
+  Future<Response> getTicketsWithHttpInfo(String tenantId, [ GetTicketsOptions? options ]) async {
     final userId = options?.userId;
     final state = options?.state;
     final skip = options?.skip;
@@ -5050,7 +5044,7 @@ class DefaultApi {
   /// * [double] skip:
   ///
   /// * [double] limit:
-  Future<GetTicketsResponse?> getTickets(String tenantId, [ ApiGetTicketsOptions? options ]) async {
+  Future<GetTicketsResponse?> getTickets(String tenantId, [ GetTicketsOptions? options ]) async {
     final response = await getTicketsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -5291,7 +5285,7 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgeProgressListWithHttpInfo(String tenantId, [ ApiGetUserBadgeProgressListOptions? options ]) async {
+  Future<Response> getUserBadgeProgressListWithHttpInfo(String tenantId, [ GetUserBadgeProgressListOptions? options ]) async {
     final userId = options?.userId;
     final limit = options?.limit;
     final skip = options?.skip;
@@ -5339,7 +5333,7 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(String tenantId, [ ApiGetUserBadgeProgressListOptions? options ]) async {
+  Future<APIGetUserBadgeProgressListResponse?> getUserBadgeProgressList(String tenantId, [ GetUserBadgeProgressListOptions? options ]) async {
     final response = await getUserBadgeProgressListWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -5370,7 +5364,7 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<Response> getUserBadgesWithHttpInfo(String tenantId, [ ApiGetUserBadgesOptions? options ]) async {
+  Future<Response> getUserBadgesWithHttpInfo(String tenantId, [ GetUserBadgesOptions? options ]) async {
     final userId = options?.userId;
     final badgeId = options?.badgeId;
     final type = options?.type;
@@ -5436,7 +5430,7 @@ class DefaultApi {
   /// * [double] limit:
   ///
   /// * [double] skip:
-  Future<APIGetUserBadgesResponse?> getUserBadges(String tenantId, [ ApiGetUserBadgesOptions? options ]) async {
+  Future<APIGetUserBadgesResponse?> getUserBadges(String tenantId, [ GetUserBadgesOptions? options ]) async {
     final response = await getUserBadgesWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -5515,7 +5509,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> getVotesForUserWithHttpInfo(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options ]) async {
+  Future<Response> getVotesForUserWithHttpInfo(String tenantId, String urlId, [ GetVotesForUserOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -5560,7 +5554,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<GetVotesForUserResponse?> getVotesForUser(String tenantId, String urlId, [ ApiGetVotesForUserOptions? options ]) async {
+  Future<GetVotesForUserResponse?> getVotesForUser(String tenantId, String urlId, [ GetVotesForUserOptions? options ]) async {
     final response = await getVotesForUserWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -5636,12 +5630,12 @@ class DefaultApi {
   /// Performs an HTTP 'PATCH /api/v1/hash-tags/{tag}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tag (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] tag (required):
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<Response> patchHashTagWithHttpInfo(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId ]) async {
+  Future<Response> patchHashTagWithHttpInfo(String tenantId, String tag, UpdateHashTagBody updateHashTagBody) async {
     // ignore: prefer_const_declarations
     final path = r'/api/v1/hash-tags/{tag}'
       .replaceAll('{tag}', tag);
@@ -5653,9 +5647,7 @@ class DefaultApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
 
     const contentTypes = <String>['application/json'];
 
@@ -5673,13 +5665,13 @@ class DefaultApi {
 
   /// Parameters:
   ///
-  /// * [String] tag (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] tag (required):
   ///
   /// * [UpdateHashTagBody] updateHashTagBody:
-  Future<UpdateHashTagResponse?> patchHashTag(String tag, UpdateHashTagBody updateHashTagBody, [ String? tenantId ]) async {
-    final response = await patchHashTagWithHttpInfo(tag, updateHashTagBody, tenantId);
+  Future<UpdateHashTagResponse?> patchHashTag(String tenantId, String tag, UpdateHashTagBody updateHashTagBody) async {
+    final response = await patchHashTagWithHttpInfo(tenantId, tag, updateHashTagBody);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -6136,7 +6128,7 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentWithHttpInfo(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options ]) async {
+  Future<Response> saveCommentWithHttpInfo(String tenantId, CreateCommentParams createCommentParams, [ SaveCommentOptions? options ]) async {
     final isLive = options?.isLive;
     final doSpamCheck = options?.doSpamCheck;
     final sendEmails = options?.sendEmails;
@@ -6192,7 +6184,7 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<APISaveCommentResponse?> saveComment(String tenantId, CreateCommentParams createCommentParams, [ ApiSaveCommentOptions? options ]) async {
+  Future<APISaveCommentResponse?> saveComment(String tenantId, CreateCommentParams createCommentParams, [ SaveCommentOptions? options ]) async {
     final response = await saveCommentWithHttpInfo(tenantId, createCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -6221,7 +6213,7 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<Response> saveCommentsBulkWithHttpInfo(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options ]) async {
+  Future<Response> saveCommentsBulkWithHttpInfo(String tenantId, List<CreateCommentParams> createCommentParams, [ SaveCommentsBulkOptions? options ]) async {
     final isLive = options?.isLive;
     final doSpamCheck = options?.doSpamCheck;
     final sendEmails = options?.sendEmails;
@@ -6277,7 +6269,7 @@ class DefaultApi {
   /// * [bool] sendEmails:
   ///
   /// * [bool] populateNotifications:
-  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(String tenantId, List<CreateCommentParams> createCommentParams, [ ApiSaveCommentsBulkOptions? options ]) async {
+  Future<List<SaveCommentsBulkResponse>?> saveCommentsBulk(String tenantId, List<CreateCommentParams> createCommentParams, [ SaveCommentsBulkOptions? options ]) async {
     final response = await saveCommentsBulkWithHttpInfo(tenantId, createCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -6427,7 +6419,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unBlockUserFromCommentWithHttpInfo(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options ]) async {
+  Future<Response> unBlockUserFromCommentWithHttpInfo(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ UnBlockUserFromCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -6474,7 +6466,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<UnblockSuccess?> unBlockUserFromComment(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ ApiUnBlockUserFromCommentOptions? options ]) async {
+  Future<UnblockSuccess?> unBlockUserFromComment(String tenantId, String id, UnBlockFromCommentParams unBlockFromCommentParams, [ UnBlockUserFromCommentOptions? options ]) async {
     final response = await unBlockUserFromCommentWithHttpInfo(tenantId, id, unBlockFromCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -6499,7 +6491,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<Response> unFlagCommentWithHttpInfo(String tenantId, String id, [ ApiUnFlagCommentOptions? options ]) async {
+  Future<Response> unFlagCommentWithHttpInfo(String tenantId, String id, [ UnFlagCommentOptions? options ]) async {
     final userId = options?.userId;
     final anonUserId = options?.anonUserId;
     // ignore: prefer_const_declarations
@@ -6544,7 +6536,7 @@ class DefaultApi {
   /// * [String] userId:
   ///
   /// * [String] anonUserId:
-  Future<FlagCommentResponse?> unFlagComment(String tenantId, String id, [ ApiUnFlagCommentOptions? options ]) async {
+  Future<FlagCommentResponse?> unFlagComment(String tenantId, String id, [ UnFlagCommentOptions? options ]) async {
     final response = await unFlagCommentWithHttpInfo(tenantId, id, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -6573,7 +6565,7 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<Response> updateCommentWithHttpInfo(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options ]) async {
+  Future<Response> updateCommentWithHttpInfo(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ UpdateCommentOptions? options ]) async {
     final contextUserId = options?.contextUserId;
     final doSpamCheck = options?.doSpamCheck;
     final isLive = options?.isLive;
@@ -6626,7 +6618,7 @@ class DefaultApi {
   /// * [bool] doSpamCheck:
   ///
   /// * [bool] isLive:
-  Future<APIEmptyResponse?> updateComment(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ ApiUpdateCommentOptions? options ]) async {
+  Future<APIEmptyResponse?> updateComment(String tenantId, String id, UpdatableCommentParams updatableCommentParams, [ UpdateCommentOptions? options ]) async {
     final response = await updateCommentWithHttpInfo(tenantId, id, updatableCommentParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -7302,8 +7294,8 @@ class DefaultApi {
 }
 
 /// Optional parameters for [DefaultApi.aggregate].
-class ApiAggregateOptions {
-  const ApiAggregateOptions({
+class AggregateOptions {
+  const AggregateOptions({
     this.parentTenantId,
     this.includeStats,
   });
@@ -7312,8 +7304,8 @@ class ApiAggregateOptions {
 }
 
 /// Optional parameters for [DefaultApi.aggregateQuestionResults].
-class ApiAggregateQuestionResultsOptions {
-  const ApiAggregateQuestionResultsOptions({
+class AggregateQuestionResultsOptions {
+  const AggregateQuestionResultsOptions({
     this.questionId,
     this.questionIds,
     this.urlId,
@@ -7330,8 +7322,8 @@ class ApiAggregateQuestionResultsOptions {
 }
 
 /// Optional parameters for [DefaultApi.blockUserFromComment].
-class ApiBlockUserFromCommentOptions {
-  const ApiBlockUserFromCommentOptions({
+class BlockUserFromCommentOptions {
+  const BlockUserFromCommentOptions({
     this.userId,
     this.anonUserId,
   });
@@ -7340,8 +7332,8 @@ class ApiBlockUserFromCommentOptions {
 }
 
 /// Optional parameters for [DefaultApi.combineCommentsWithQuestionResults].
-class ApiCombineCommentsWithQuestionResultsOptions {
-  const ApiCombineCommentsWithQuestionResultsOptions({
+class CombineCommentsWithQuestionResultsOptions {
+  const CombineCommentsWithQuestionResultsOptions({
     this.questionId,
     this.questionIds,
     this.urlId,
@@ -7362,8 +7354,8 @@ class ApiCombineCommentsWithQuestionResultsOptions {
 }
 
 /// Optional parameters for [DefaultApi.createFeedPost].
-class ApiCreateFeedPostOptions {
-  const ApiCreateFeedPostOptions({
+class CreateFeedPostOptions {
+  const CreateFeedPostOptions({
     this.broadcastId,
     this.isLive,
     this.doSpamCheck,
@@ -7376,8 +7368,8 @@ class ApiCreateFeedPostOptions {
 }
 
 /// Optional parameters for [DefaultApi.createVote].
-class ApiCreateVoteOptions {
-  const ApiCreateVoteOptions({
+class CreateVoteOptions {
+  const CreateVoteOptions({
     this.userId,
     this.anonUserId,
   });
@@ -7386,8 +7378,8 @@ class ApiCreateVoteOptions {
 }
 
 /// Optional parameters for [DefaultApi.deleteComment].
-class ApiDeleteCommentOptions {
-  const ApiDeleteCommentOptions({
+class DeleteCommentOptions {
+  const DeleteCommentOptions({
     this.contextUserId,
     this.isLive,
   });
@@ -7396,8 +7388,8 @@ class ApiDeleteCommentOptions {
 }
 
 /// Optional parameters for [DefaultApi.deleteSSOUser].
-class ApiDeleteSSOUserOptions {
-  const ApiDeleteSSOUserOptions({
+class DeleteSSOUserOptions {
+  const DeleteSSOUserOptions({
     this.deleteComments,
     this.commentDeleteMode,
   });
@@ -7406,8 +7398,8 @@ class ApiDeleteSSOUserOptions {
 }
 
 /// Optional parameters for [DefaultApi.deleteTenantUser].
-class ApiDeleteTenantUserOptions {
-  const ApiDeleteTenantUserOptions({
+class DeleteTenantUserOptions {
+  const DeleteTenantUserOptions({
     this.deleteComments,
     this.commentDeleteMode,
   });
@@ -7416,8 +7408,8 @@ class ApiDeleteTenantUserOptions {
 }
 
 /// Optional parameters for [DefaultApi.flagComment].
-class ApiFlagCommentOptions {
-  const ApiFlagCommentOptions({
+class FlagCommentOptions {
+  const FlagCommentOptions({
     this.userId,
     this.anonUserId,
   });
@@ -7426,8 +7418,8 @@ class ApiFlagCommentOptions {
 }
 
 /// Optional parameters for [DefaultApi.getAuditLogs].
-class ApiGetAuditLogsOptions {
-  const ApiGetAuditLogsOptions({
+class GetAuditLogsOptions {
+  const GetAuditLogsOptions({
     this.limit,
     this.skip,
     this.order,
@@ -7442,8 +7434,8 @@ class ApiGetAuditLogsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getComments].
-class ApiGetCommentsOptions {
-  const ApiGetCommentsOptions({
+class GetCommentsOptions {
+  const GetCommentsOptions({
     this.page,
     this.limit,
     this.skip,
@@ -7480,8 +7472,8 @@ class ApiGetCommentsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getFeedPosts].
-class ApiGetFeedPostsOptions {
-  const ApiGetFeedPostsOptions({
+class GetFeedPostsOptions {
+  const GetFeedPostsOptions({
     this.afterId,
     this.limit,
     this.tags,
@@ -7492,8 +7484,8 @@ class ApiGetFeedPostsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getNotificationCount].
-class ApiGetNotificationCountOptions {
-  const ApiGetNotificationCountOptions({
+class GetNotificationCountOptions {
+  const GetNotificationCountOptions({
     this.userId,
     this.urlId,
     this.fromCommentId,
@@ -7508,8 +7500,8 @@ class ApiGetNotificationCountOptions {
 }
 
 /// Optional parameters for [DefaultApi.getNotifications].
-class ApiGetNotificationsOptions {
-  const ApiGetNotificationsOptions({
+class GetNotificationsOptions {
+  const GetNotificationsOptions({
     this.userId,
     this.urlId,
     this.fromCommentId,
@@ -7526,8 +7518,8 @@ class ApiGetNotificationsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getPendingWebhookEventCount].
-class ApiGetPendingWebhookEventCountOptions {
-  const ApiGetPendingWebhookEventCountOptions({
+class GetPendingWebhookEventCountOptions {
+  const GetPendingWebhookEventCountOptions({
     this.commentId,
     this.externalId,
     this.eventType,
@@ -7544,8 +7536,8 @@ class ApiGetPendingWebhookEventCountOptions {
 }
 
 /// Optional parameters for [DefaultApi.getPendingWebhookEvents].
-class ApiGetPendingWebhookEventsOptions {
-  const ApiGetPendingWebhookEventsOptions({
+class GetPendingWebhookEventsOptions {
+  const GetPendingWebhookEventsOptions({
     this.commentId,
     this.externalId,
     this.eventType,
@@ -7564,8 +7556,8 @@ class ApiGetPendingWebhookEventsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getQuestionResults].
-class ApiGetQuestionResultsOptions {
-  const ApiGetQuestionResultsOptions({
+class GetQuestionResultsOptions {
+  const GetQuestionResultsOptions({
     this.urlId,
     this.userId,
     this.startDate,
@@ -7582,8 +7574,8 @@ class ApiGetQuestionResultsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getTenantDailyUsages].
-class ApiGetTenantDailyUsagesOptions {
-  const ApiGetTenantDailyUsagesOptions({
+class GetTenantDailyUsagesOptions {
+  const GetTenantDailyUsagesOptions({
     this.yearNumber,
     this.monthNumber,
     this.dayNumber,
@@ -7596,8 +7588,8 @@ class ApiGetTenantDailyUsagesOptions {
 }
 
 /// Optional parameters for [DefaultApi.getTenants].
-class ApiGetTenantsOptions {
-  const ApiGetTenantsOptions({
+class GetTenantsOptions {
+  const GetTenantsOptions({
     this.meta,
     this.skip,
   });
@@ -7606,8 +7598,8 @@ class ApiGetTenantsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getTickets].
-class ApiGetTicketsOptions {
-  const ApiGetTicketsOptions({
+class GetTicketsOptions {
+  const GetTicketsOptions({
     this.userId,
     this.state,
     this.skip,
@@ -7620,8 +7612,8 @@ class ApiGetTicketsOptions {
 }
 
 /// Optional parameters for [DefaultApi.getUserBadgeProgressList].
-class ApiGetUserBadgeProgressListOptions {
-  const ApiGetUserBadgeProgressListOptions({
+class GetUserBadgeProgressListOptions {
+  const GetUserBadgeProgressListOptions({
     this.userId,
     this.limit,
     this.skip,
@@ -7632,8 +7624,8 @@ class ApiGetUserBadgeProgressListOptions {
 }
 
 /// Optional parameters for [DefaultApi.getUserBadges].
-class ApiGetUserBadgesOptions {
-  const ApiGetUserBadgesOptions({
+class GetUserBadgesOptions {
+  const GetUserBadgesOptions({
     this.userId,
     this.badgeId,
     this.type,
@@ -7650,8 +7642,8 @@ class ApiGetUserBadgesOptions {
 }
 
 /// Optional parameters for [DefaultApi.getVotesForUser].
-class ApiGetVotesForUserOptions {
-  const ApiGetVotesForUserOptions({
+class GetVotesForUserOptions {
+  const GetVotesForUserOptions({
     this.userId,
     this.anonUserId,
   });
@@ -7660,8 +7652,8 @@ class ApiGetVotesForUserOptions {
 }
 
 /// Optional parameters for [DefaultApi.saveComment].
-class ApiSaveCommentOptions {
-  const ApiSaveCommentOptions({
+class SaveCommentOptions {
+  const SaveCommentOptions({
     this.isLive,
     this.doSpamCheck,
     this.sendEmails,
@@ -7674,8 +7666,8 @@ class ApiSaveCommentOptions {
 }
 
 /// Optional parameters for [DefaultApi.saveCommentsBulk].
-class ApiSaveCommentsBulkOptions {
-  const ApiSaveCommentsBulkOptions({
+class SaveCommentsBulkOptions {
+  const SaveCommentsBulkOptions({
     this.isLive,
     this.doSpamCheck,
     this.sendEmails,
@@ -7688,8 +7680,8 @@ class ApiSaveCommentsBulkOptions {
 }
 
 /// Optional parameters for [DefaultApi.unBlockUserFromComment].
-class ApiUnBlockUserFromCommentOptions {
-  const ApiUnBlockUserFromCommentOptions({
+class UnBlockUserFromCommentOptions {
+  const UnBlockUserFromCommentOptions({
     this.userId,
     this.anonUserId,
   });
@@ -7698,8 +7690,8 @@ class ApiUnBlockUserFromCommentOptions {
 }
 
 /// Optional parameters for [DefaultApi.unFlagComment].
-class ApiUnFlagCommentOptions {
-  const ApiUnFlagCommentOptions({
+class UnFlagCommentOptions {
+  const UnFlagCommentOptions({
     this.userId,
     this.anonUserId,
   });
@@ -7708,8 +7700,8 @@ class ApiUnFlagCommentOptions {
 }
 
 /// Optional parameters for [DefaultApi.updateComment].
-class ApiUpdateCommentOptions {
-  const ApiUpdateCommentOptions({
+class UpdateCommentOptions {
+  const UpdateCommentOptions({
     this.contextUserId,
     this.doSpamCheck,
     this.isLive,
diff --git a/client/lib/api/moderation_api.dart b/client/lib/api/moderation_api.dart
index 5944501..fd6bdfd 100644
--- a/client/lib/api/moderation_api.dart
+++ b/client/lib/api/moderation_api.dart
@@ -16,24 +16,23 @@ class ModerationApi {
 
   final ApiClient apiClient;
 
-  /// Performs an HTTP 'DELETE /auth/my-account/moderate-comments/vote/{commentId}/{voteId}' operation and returns the [Response].
+  /// Performs an HTTP 'DELETE /auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [String] voteId (required):
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteModerationVoteWithHttpInfo(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> deleteModerationVoteWithHttpInfo(String tenantId, String commentId, String voteId, [ DeleteModerationVoteOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/vote/{commentId}/{voteId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId}'
       .replaceAll('{commentId}', commentId)
       .replaceAll('{voteId}', voteId);
 
@@ -44,9 +43,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -70,17 +67,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [String] voteId (required):
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteModerationVote(String commentId, String voteId, [ ApiDeleteModerationVoteOptions? options ]) async {
-    final response = await deleteModerationVoteWithHttpInfo(commentId, voteId, options);
+  Future<VoteDeleteResponse?> deleteModerationVote(String tenantId, String commentId, String voteId, [ DeleteModerationVoteOptions? options ]) async {
+    final response = await deleteModerationVoteWithHttpInfo(tenantId, commentId, voteId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -94,9 +91,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/api/comments' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/api/comments' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [double] page:
   ///
   /// * [double] count:
@@ -113,10 +112,8 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getApiCommentsWithHttpInfo([ ApiGetApiCommentsOptions? options ]) async {
+  Future<Response> getApiCommentsWithHttpInfo(String tenantId, [ GetApiCommentsOptions? options ]) async {
     final page = options?.page;
     final count = options?.count;
     final textSearch = options?.textSearch;
@@ -125,10 +122,9 @@ class ModerationApi {
     final searchFilters = options?.searchFilters;
     final sorts = options?.sorts;
     final demo = options?.demo;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/api/comments';
+    final path = r'/auth/my-account/moderate-comments/mod_api/api/comments';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -137,6 +133,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (page != null) {
       queryParams.addAll(_queryParams('', 'page', page));
     }
@@ -161,9 +158,6 @@ class ModerationApi {
     if (demo != null) {
       queryParams.addAll(_queryParams('', 'demo', demo));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -184,6 +178,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [double] page:
   ///
   /// * [double] count:
@@ -200,11 +196,9 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentsResponse?> getApiComments([ ApiGetApiCommentsOptions? options ]) async {
-    final response = await getApiCommentsWithHttpInfo(options);
+  Future<ModerationAPIGetCommentsResponse?> getApiComments(String tenantId, [ GetApiCommentsOptions? options ]) async {
+    final response = await getApiCommentsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -218,20 +212,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/api/export/status' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/api/export/status' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] batchJobId:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] batchJobId:
   ///
   /// * [String] sso:
-  Future<Response> getApiExportStatusWithHttpInfo([ ApiGetApiExportStatusOptions? options ]) async {
+  Future<Response> getApiExportStatusWithHttpInfo(String tenantId, [ GetApiExportStatusOptions? options ]) async {
     final batchJobId = options?.batchJobId;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/api/export/status';
+    final path = r'/auth/my-account/moderate-comments/mod_api/api/export/status';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -240,12 +233,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (batchJobId != null) {
       queryParams.addAll(_queryParams('', 'batchJobId', batchJobId));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -266,13 +257,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] batchJobId:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] batchJobId:
   ///
   /// * [String] sso:
-  Future<ModerationExportStatusResponse?> getApiExportStatus([ ApiGetApiExportStatusOptions? options ]) async {
-    final response = await getApiExportStatusWithHttpInfo(options);
+  Future<ModerationExportStatusResponse?> getApiExportStatus(String tenantId, [ GetApiExportStatusOptions? options ]) async {
+    final response = await getApiExportStatusWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -286,9 +277,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/api/ids' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/api/ids' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] textSearch:
   ///
   /// * [String] byIPFromComment:
@@ -301,20 +294,17 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getApiIdsWithHttpInfo([ ApiGetApiIdsOptions? options ]) async {
+  Future<Response> getApiIdsWithHttpInfo(String tenantId, [ GetApiIdsOptions? options ]) async {
     final textSearch = options?.textSearch;
     final byIPFromComment = options?.byIPFromComment;
     final filters = options?.filters;
     final searchFilters = options?.searchFilters;
     final afterId = options?.afterId;
     final demo = options?.demo;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/api/ids';
+    final path = r'/auth/my-account/moderate-comments/mod_api/api/ids';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -323,6 +313,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (textSearch != null) {
       queryParams.addAll(_queryParams('', 'text-search', textSearch));
     }
@@ -341,9 +332,6 @@ class ModerationApi {
     if (demo != null) {
       queryParams.addAll(_queryParams('', 'demo', demo));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -364,6 +352,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] textSearch:
   ///
   /// * [String] byIPFromComment:
@@ -376,11 +366,9 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<ModerationAPIGetCommentIdsResponse?> getApiIds([ ApiGetApiIdsOptions? options ]) async {
-    final response = await getApiIdsWithHttpInfo(options);
+  Future<ModerationAPIGetCommentIdsResponse?> getApiIds(String tenantId, [ GetApiIdsOptions? options ]) async {
+    final response = await getApiIdsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -394,19 +382,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/ban-users/from-comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> getBanUsersFromCommentWithHttpInfo(String commentId, [ ApiGetBanUsersFromCommentOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getBanUsersFromCommentWithHttpInfo(String tenantId, String commentId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/ban-users/from-comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -416,9 +402,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -439,13 +423,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String commentId, [ ApiGetBanUsersFromCommentOptions? options ]) async {
-    final response = await getBanUsersFromCommentWithHttpInfo(commentId, options);
+  Future<GetBannedUsersFromCommentResponse?> getBanUsersFromComment(String tenantId, String commentId, [ String? sso ]) async {
+    final response = await getBanUsersFromCommentWithHttpInfo(tenantId, commentId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -459,19 +443,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-comment-ban-status/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> getCommentBanStatusWithHttpInfo(String commentId, [ ApiGetCommentBanStatusOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getCommentBanStatusWithHttpInfo(String tenantId, String commentId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/get-comment-ban-status/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -481,9 +463,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -504,13 +484,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String commentId, [ ApiGetCommentBanStatusOptions? options ]) async {
-    final response = await getCommentBanStatusWithHttpInfo(commentId, options);
+  Future<GetCommentBanStatusResponse?> getCommentBanStatus(String tenantId, String commentId, [ String? sso ]) async {
+    final response = await getCommentBanStatusWithHttpInfo(tenantId, commentId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -524,19 +504,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/comment-children/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/comment-children/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> getCommentChildrenWithHttpInfo(String commentId, [ ApiGetCommentChildrenOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getCommentChildrenWithHttpInfo(String tenantId, String commentId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/comment-children/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/comment-children/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -546,9 +524,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -569,13 +545,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String commentId, [ ApiGetCommentChildrenOptions? options ]) async {
-    final response = await getCommentChildrenWithHttpInfo(commentId, options);
+  Future<ModerationAPIChildCommentsResponse?> getCommentChildren(String tenantId, String commentId, [ String? sso ]) async {
+    final response = await getCommentChildrenWithHttpInfo(tenantId, commentId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -589,9 +565,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/count' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/count' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] textSearch:
   ///
   /// * [String] byIPFromComment:
@@ -602,19 +580,16 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getCountWithHttpInfo([ ApiGetCountOptions? options ]) async {
+  Future<Response> getCountWithHttpInfo(String tenantId, [ GetCountOptions? options ]) async {
     final textSearch = options?.textSearch;
     final byIPFromComment = options?.byIPFromComment;
     final filter = options?.filter;
     final searchFilters = options?.searchFilters;
     final demo = options?.demo;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/count';
+    final path = r'/auth/my-account/moderate-comments/mod_api/count';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -623,6 +598,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (textSearch != null) {
       queryParams.addAll(_queryParams('', 'text-search', textSearch));
     }
@@ -638,9 +614,6 @@ class ModerationApi {
     if (demo != null) {
       queryParams.addAll(_queryParams('', 'demo', demo));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -661,6 +634,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] textSearch:
   ///
   /// * [String] byIPFromComment:
@@ -671,11 +646,9 @@ class ModerationApi {
   ///
   /// * [bool] demo:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<ModerationAPICountCommentsResponse?> getCount([ ApiGetCountOptions? options ]) async {
-    final response = await getCountWithHttpInfo(options);
+  Future<ModerationAPICountCommentsResponse?> getCount(String tenantId, [ GetCountOptions? options ]) async {
+    final response = await getCountWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -689,17 +662,15 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/banned-users/counts' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/banned-users/mod_api/counts' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getCountsWithHttpInfo([ ApiGetCountsOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getCountsWithHttpInfo(String tenantId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/banned-users/counts';
+    final path = r'/auth/my-account/moderate-comments/banned-users/mod_api/counts';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -708,9 +679,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -731,11 +700,11 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<GetBannedUsersCountResponse?> getCounts([ ApiGetCountsOptions? options ]) async {
-    final response = await getCountsWithHttpInfo(options);
+  Future<GetBannedUsersCountResponse?> getCounts(String tenantId, [ String? sso ]) async {
+    final response = await getCountsWithHttpInfo(tenantId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -749,19 +718,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/logs/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/logs/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> getLogsWithHttpInfo(String commentId, [ ApiGetLogsOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getLogsWithHttpInfo(String tenantId, String commentId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/logs/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/logs/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -771,9 +738,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -794,13 +759,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<ModerationAPIGetLogsResponse?> getLogs(String commentId, [ ApiGetLogsOptions? options ]) async {
-    final response = await getLogsWithHttpInfo(commentId, options);
+  Future<ModerationAPIGetLogsResponse?> getLogs(String tenantId, String commentId, [ String? sso ]) async {
+    final response = await getLogsWithHttpInfo(tenantId, commentId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -814,17 +779,15 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-manual-badges' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/get-manual-badges' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getManualBadgesWithHttpInfo([ ApiGetManualBadgesOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getManualBadgesWithHttpInfo(String tenantId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/get-manual-badges';
+    final path = r'/auth/my-account/moderate-comments/mod_api/get-manual-badges';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -833,9 +796,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -856,11 +817,11 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<GetTenantManualBadgesResponse?> getManualBadges([ ApiGetManualBadgesOptions? options ]) async {
-    final response = await getManualBadgesWithHttpInfo(options);
+  Future<GetTenantManualBadgesResponse?> getManualBadges(String tenantId, [ String? sso ]) async {
+    final response = await getManualBadgesWithHttpInfo(tenantId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -874,23 +835,22 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-manual-badges-for-user' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] badgesUserId:
   ///
   /// * [String] commentId:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getManualBadgesForUserWithHttpInfo([ ApiGetManualBadgesForUserOptions? options ]) async {
+  Future<Response> getManualBadgesForUserWithHttpInfo(String tenantId, [ GetManualBadgesForUserOptions? options ]) async {
     final badgesUserId = options?.badgesUserId;
     final commentId = options?.commentId;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/get-manual-badges-for-user';
+    final path = r'/auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -899,15 +859,13 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (badgesUserId != null) {
       queryParams.addAll(_queryParams('', 'badgesUserId', badgesUserId));
     }
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -928,15 +886,15 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] badgesUserId:
   ///
   /// * [String] commentId:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<GetUserManualBadgesResponse?> getManualBadgesForUser([ ApiGetManualBadgesForUserOptions? options ]) async {
-    final response = await getManualBadgesForUserWithHttpInfo(options);
+  Future<GetUserManualBadgesResponse?> getManualBadgesForUser(String tenantId, [ GetManualBadgesForUserOptions? options ]) async {
+    final response = await getManualBadgesForUserWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -950,25 +908,24 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] includeEmail:
   ///
   /// * [bool] includeIP:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getModerationCommentWithHttpInfo(String commentId, [ ApiGetModerationCommentOptions? options ]) async {
+  Future<Response> getModerationCommentWithHttpInfo(String tenantId, String commentId, [ GetModerationCommentOptions? options ]) async {
     final includeEmail = options?.includeEmail;
     final includeIP = options?.includeIP;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -978,15 +935,13 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (includeEmail != null) {
       queryParams.addAll(_queryParams('', 'includeEmail', includeEmail));
     }
     if (includeIP != null) {
       queryParams.addAll(_queryParams('', 'includeIP', includeIP));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1007,17 +962,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] includeEmail:
   ///
   /// * [bool] includeIP:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<ModerationAPICommentResponse?> getModerationComment(String commentId, [ ApiGetModerationCommentOptions? options ]) async {
-    final response = await getModerationCommentWithHttpInfo(commentId, options);
+  Future<ModerationAPICommentResponse?> getModerationComment(String tenantId, String commentId, [ GetModerationCommentOptions? options ]) async {
+    final response = await getModerationCommentWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1031,19 +986,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-comment-text/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<Response> getModerationCommentTextWithHttpInfo(String commentId, [ ApiGetModerationCommentTextOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getModerationCommentTextWithHttpInfo(String tenantId, String commentId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/get-comment-text/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -1053,9 +1006,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1076,13 +1027,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] sso:
-  Future<GetCommentTextResponse?> getModerationCommentText(String commentId, [ ApiGetModerationCommentTextOptions? options ]) async {
-    final response = await getModerationCommentTextWithHttpInfo(commentId, options);
+  Future<GetCommentTextResponse?> getModerationCommentText(String tenantId, String commentId, [ String? sso ]) async {
+    final response = await getModerationCommentTextWithHttpInfo(tenantId, commentId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1096,9 +1047,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/pre-ban-summary/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] includeByUserIdAndEmail:
@@ -1107,17 +1060,14 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getPreBanSummaryWithHttpInfo(String commentId, [ ApiGetPreBanSummaryOptions? options ]) async {
+  Future<Response> getPreBanSummaryWithHttpInfo(String tenantId, String commentId, [ GetPreBanSummaryOptions? options ]) async {
     final includeByUserIdAndEmail = options?.includeByUserIdAndEmail;
     final includeByIP = options?.includeByIP;
     final includeByEmailDomain = options?.includeByEmailDomain;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/pre-ban-summary/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -1127,6 +1077,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (includeByUserIdAndEmail != null) {
       queryParams.addAll(_queryParams('', 'includeByUserIdAndEmail', includeByUserIdAndEmail));
     }
@@ -1136,9 +1087,6 @@ class ModerationApi {
     if (includeByEmailDomain != null) {
       queryParams.addAll(_queryParams('', 'includeByEmailDomain', includeByEmailDomain));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1159,6 +1107,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] includeByUserIdAndEmail:
@@ -1167,11 +1117,9 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<PreBanSummary?> getPreBanSummary(String commentId, [ ApiGetPreBanSummaryOptions? options ]) async {
-    final response = await getPreBanSummaryWithHttpInfo(commentId, options);
+  Future<PreBanSummary?> getPreBanSummary(String tenantId, String commentId, [ GetPreBanSummaryOptions? options ]) async {
+    final response = await getPreBanSummaryWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1185,26 +1133,25 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/search/comments/summary' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/search/comments/summary' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] value:
   ///
   /// * [String] filters:
   ///
   /// * [String] searchFilters:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> getSearchCommentsSummaryWithHttpInfo([ ApiGetSearchCommentsSummaryOptions? options ]) async {
+  Future<Response> getSearchCommentsSummaryWithHttpInfo(String tenantId, [ GetSearchCommentsSummaryOptions? options ]) async {
     final value = options?.value;
     final filters = options?.filters;
     final searchFilters = options?.searchFilters;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/search/comments/summary';
+    final path = r'/auth/my-account/moderate-comments/mod_api/search/comments/summary';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1213,6 +1160,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
@@ -1222,9 +1170,6 @@ class ModerationApi {
     if (searchFilters != null) {
       queryParams.addAll(_queryParams('', 'searchFilters', searchFilters));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1245,17 +1190,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] value:
   ///
   /// * [String] filters:
   ///
   /// * [String] searchFilters:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary([ ApiGetSearchCommentsSummaryOptions? options ]) async {
-    final response = await getSearchCommentsSummaryWithHttpInfo(options);
+  Future<ModerationCommentSearchResponse?> getSearchCommentsSummary(String tenantId, [ GetSearchCommentsSummaryOptions? options ]) async {
+    final response = await getSearchCommentsSummaryWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1269,20 +1214,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/search/pages' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/search/pages' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] value:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] value:
   ///
   /// * [String] sso:
-  Future<Response> getSearchPagesWithHttpInfo([ ApiGetSearchPagesOptions? options ]) async {
+  Future<Response> getSearchPagesWithHttpInfo(String tenantId, [ GetSearchPagesOptions? options ]) async {
     final value = options?.value;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/search/pages';
+    final path = r'/auth/my-account/moderate-comments/mod_api/search/pages';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1291,12 +1235,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1317,13 +1259,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] value:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] value:
   ///
   /// * [String] sso:
-  Future<ModerationPageSearchResponse?> getSearchPages([ ApiGetSearchPagesOptions? options ]) async {
-    final response = await getSearchPagesWithHttpInfo(options);
+  Future<ModerationPageSearchResponse?> getSearchPages(String tenantId, [ GetSearchPagesOptions? options ]) async {
+    final response = await getSearchPagesWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1337,20 +1279,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/search/sites' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/search/sites' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] value:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] value:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSitesWithHttpInfo([ ApiGetSearchSitesOptions? options ]) async {
+  Future<Response> getSearchSitesWithHttpInfo(String tenantId, [ GetSearchSitesOptions? options ]) async {
     final value = options?.value;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/search/sites';
+    final path = r'/auth/my-account/moderate-comments/mod_api/search/sites';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1359,12 +1300,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1385,13 +1324,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] value:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] value:
   ///
   /// * [String] sso:
-  Future<ModerationSiteSearchResponse?> getSearchSites([ ApiGetSearchSitesOptions? options ]) async {
-    final response = await getSearchSitesWithHttpInfo(options);
+  Future<ModerationSiteSearchResponse?> getSearchSites(String tenantId, [ GetSearchSitesOptions? options ]) async {
+    final response = await getSearchSitesWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1405,20 +1344,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/search/suggest' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/search/suggest' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] textSearch:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] textSearch:
   ///
   /// * [String] sso:
-  Future<Response> getSearchSuggestWithHttpInfo([ ApiGetSearchSuggestOptions? options ]) async {
+  Future<Response> getSearchSuggestWithHttpInfo(String tenantId, [ GetSearchSuggestOptions? options ]) async {
     final textSearch = options?.textSearch;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/search/suggest';
+    final path = r'/auth/my-account/moderate-comments/mod_api/search/suggest';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1427,12 +1365,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (textSearch != null) {
       queryParams.addAll(_queryParams('', 'text-search', textSearch));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1453,13 +1389,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] textSearch:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] textSearch:
   ///
   /// * [String] sso:
-  Future<ModerationSuggestResponse?> getSearchSuggest([ ApiGetSearchSuggestOptions? options ]) async {
-    final response = await getSearchSuggestWithHttpInfo(options);
+  Future<ModerationSuggestResponse?> getSearchSuggest(String tenantId, [ GetSearchSuggestOptions? options ]) async {
+    final response = await getSearchSuggestWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1473,20 +1409,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/search/users' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/search/users' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] value:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] value:
   ///
   /// * [String] sso:
-  Future<Response> getSearchUsersWithHttpInfo([ ApiGetSearchUsersOptions? options ]) async {
+  Future<Response> getSearchUsersWithHttpInfo(String tenantId, [ GetSearchUsersOptions? options ]) async {
     final value = options?.value;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/search/users';
+    final path = r'/auth/my-account/moderate-comments/mod_api/search/users';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1495,12 +1430,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (value != null) {
       queryParams.addAll(_queryParams('', 'value', value));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1521,13 +1454,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] value:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] value:
   ///
   /// * [String] sso:
-  Future<ModerationUserSearchResponse?> getSearchUsers([ ApiGetSearchUsersOptions? options ]) async {
-    final response = await getSearchUsersWithHttpInfo(options);
+  Future<ModerationUserSearchResponse?> getSearchUsers(String tenantId, [ GetSearchUsersOptions? options ]) async {
+    final response = await getSearchUsersWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1541,20 +1474,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-trust-factor' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/get-trust-factor' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] userId:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] userId:
   ///
   /// * [String] sso:
-  Future<Response> getTrustFactorWithHttpInfo([ ApiGetTrustFactorOptions? options ]) async {
+  Future<Response> getTrustFactorWithHttpInfo(String tenantId, [ GetTrustFactorOptions? options ]) async {
     final userId = options?.userId;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/get-trust-factor';
+    final path = r'/auth/my-account/moderate-comments/mod_api/get-trust-factor';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1563,12 +1495,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (userId != null) {
       queryParams.addAll(_queryParams('', 'userId', userId));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1589,13 +1519,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] userId:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] userId:
   ///
   /// * [String] sso:
-  Future<GetUserTrustFactorResponse?> getTrustFactor([ ApiGetTrustFactorOptions? options ]) async {
-    final response = await getTrustFactorWithHttpInfo(options);
+  Future<GetUserTrustFactorResponse?> getTrustFactor(String tenantId, [ GetTrustFactorOptions? options ]) async {
+    final response = await getTrustFactorWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1609,17 +1539,15 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/user-ban-preference' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/user-ban-preference' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<Response> getUserBanPreferenceWithHttpInfo([ ApiGetUserBanPreferenceOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> getUserBanPreferenceWithHttpInfo(String tenantId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/user-ban-preference';
+    final path = r'/auth/my-account/moderate-comments/mod_api/user-ban-preference';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1628,9 +1556,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1651,11 +1577,11 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] tenantId:
+  /// * [String] tenantId (required):
   ///
   /// * [String] sso:
-  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference([ ApiGetUserBanPreferenceOptions? options ]) async {
-    final response = await getUserBanPreferenceWithHttpInfo(options);
+  Future<APIModerateGetUserBanPreferencesResponse?> getUserBanPreference(String tenantId, [ String? sso ]) async {
+    final response = await getUserBanPreferenceWithHttpInfo(tenantId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1669,20 +1595,19 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/get-user-internal-profile' operation and returns the [Response].
+  /// Performs an HTTP 'GET /auth/my-account/moderate-comments/mod_api/get-user-internal-profile' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId:
   ///
   /// * [String] sso:
-  Future<Response> getUserInternalProfileWithHttpInfo([ ApiGetUserInternalProfileOptions? options ]) async {
+  Future<Response> getUserInternalProfileWithHttpInfo(String tenantId, [ GetUserInternalProfileOptions? options ]) async {
     final commentId = options?.commentId;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/get-user-internal-profile';
+    final path = r'/auth/my-account/moderate-comments/mod_api/get-user-internal-profile';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1691,12 +1616,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1717,13 +1640,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId:
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId:
   ///
   /// * [String] sso:
-  Future<GetUserInternalProfileResponse?> getUserInternalProfile([ ApiGetUserInternalProfileOptions? options ]) async {
-    final response = await getUserInternalProfileWithHttpInfo(options);
+  Future<GetUserInternalProfileResponse?> getUserInternalProfile(String tenantId, [ GetUserInternalProfileOptions? options ]) async {
+    final response = await getUserInternalProfileWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1737,24 +1660,23 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/adjust-comment-votes/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [AdjustCommentVotesParams] adjustCommentVotesParams (required):
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postAdjustCommentVotesWithHttpInfo(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> postAdjustCommentVotesWithHttpInfo(String tenantId, String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ PostAdjustCommentVotesOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/adjust-comment-votes/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -1764,9 +1686,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -1790,17 +1710,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [AdjustCommentVotesParams] adjustCommentVotesParams (required):
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<AdjustVotesResponse?> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ ApiPostAdjustCommentVotesOptions? options ]) async {
-    final response = await postAdjustCommentVotesWithHttpInfo(commentId, adjustCommentVotesParams, options);
+  Future<AdjustVotesResponse?> postAdjustCommentVotes(String tenantId, String commentId, AdjustCommentVotesParams adjustCommentVotesParams, [ PostAdjustCommentVotesOptions? options ]) async {
+    final response = await postAdjustCommentVotesWithHttpInfo(tenantId, commentId, adjustCommentVotesParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1814,9 +1734,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/api/export' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/api/export' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] textSearch:
   ///
   /// * [String] byIPFromComment:
@@ -1827,19 +1749,16 @@ class ModerationApi {
   ///
   /// * [String] sorts:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> postApiExportWithHttpInfo([ ApiPostApiExportOptions? options ]) async {
+  Future<Response> postApiExportWithHttpInfo(String tenantId, [ PostApiExportOptions? options ]) async {
     final textSearch = options?.textSearch;
     final byIPFromComment = options?.byIPFromComment;
     final filters = options?.filters;
     final searchFilters = options?.searchFilters;
     final sorts = options?.sorts;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/api/export';
+    final path = r'/auth/my-account/moderate-comments/mod_api/api/export';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -1848,6 +1767,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (textSearch != null) {
       queryParams.addAll(_queryParams('', 'text-search', textSearch));
     }
@@ -1863,9 +1783,6 @@ class ModerationApi {
     if (sorts != null) {
       queryParams.addAll(_queryParams('', 'sorts', sorts));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -1886,6 +1803,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] textSearch:
   ///
   /// * [String] byIPFromComment:
@@ -1896,11 +1815,9 @@ class ModerationApi {
   ///
   /// * [String] sorts:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<ModerationExportResponse?> postApiExport([ ApiPostApiExportOptions? options ]) async {
-    final response = await postApiExportWithHttpInfo(options);
+  Future<ModerationExportResponse?> postApiExport(String tenantId, [ PostApiExportOptions? options ]) async {
+    final response = await postApiExportWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1914,9 +1831,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/ban-user/from-comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] banEmail:
@@ -1935,10 +1854,8 @@ class ModerationApi {
   ///
   /// * [String] banReason:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> postBanUserFromCommentWithHttpInfo(String commentId, [ ApiPostBanUserFromCommentOptions? options ]) async {
+  Future<Response> postBanUserFromCommentWithHttpInfo(String tenantId, String commentId, [ PostBanUserFromCommentOptions? options ]) async {
     final banEmail = options?.banEmail;
     final banEmailDomain = options?.banEmailDomain;
     final banIP = options?.banIP;
@@ -1947,10 +1864,9 @@ class ModerationApi {
     final isShadowBan = options?.isShadowBan;
     final updateId = options?.updateId;
     final banReason = options?.banReason;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/ban-user/from-comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -1960,6 +1876,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (banEmail != null) {
       queryParams.addAll(_queryParams('', 'banEmail', banEmail));
     }
@@ -1984,9 +1901,6 @@ class ModerationApi {
     if (banReason != null) {
       queryParams.addAll(_queryParams('', 'banReason', banReason));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2007,6 +1921,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] banEmail:
@@ -2025,11 +1941,9 @@ class ModerationApi {
   ///
   /// * [String] banReason:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<BanUserFromCommentResult?> postBanUserFromComment(String commentId, [ ApiPostBanUserFromCommentOptions? options ]) async {
-    final response = await postBanUserFromCommentWithHttpInfo(commentId, options);
+  Future<BanUserFromCommentResult?> postBanUserFromComment(String tenantId, String commentId, [ PostBanUserFromCommentOptions? options ]) async {
+    final response = await postBanUserFromCommentWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2043,19 +1957,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/ban-user/undo' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/ban-user/undo' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [BanUserUndoParams] banUserUndoParams (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [BanUserUndoParams] banUserUndoParams (required):
   ///
   /// * [String] sso:
-  Future<Response> postBanUserUndoWithHttpInfo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> postBanUserUndoWithHttpInfo(String tenantId, BanUserUndoParams banUserUndoParams, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/ban-user/undo';
+    final path = r'/auth/my-account/moderate-comments/mod_api/ban-user/undo';
 
     // ignore: prefer_final_locals
     Object? postBody = banUserUndoParams;
@@ -2064,9 +1976,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2087,13 +1997,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [BanUserUndoParams] banUserUndoParams (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [BanUserUndoParams] banUserUndoParams (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postBanUserUndo(BanUserUndoParams banUserUndoParams, [ ApiPostBanUserUndoOptions? options ]) async {
-    final response = await postBanUserUndoWithHttpInfo(banUserUndoParams, options);
+  Future<APIEmptyResponse?> postBanUserUndo(String tenantId, BanUserUndoParams banUserUndoParams, [ String? sso ]) async {
+    final response = await postBanUserUndoWithHttpInfo(tenantId, banUserUndoParams, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2107,9 +2017,11 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/bulk-pre-ban-summary' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [BulkPreBanParams] bulkPreBanParams (required):
   ///
   /// * [bool] includeByUserIdAndEmail:
@@ -2118,17 +2030,14 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> postBulkPreBanSummaryWithHttpInfo(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options ]) async {
+  Future<Response> postBulkPreBanSummaryWithHttpInfo(String tenantId, BulkPreBanParams bulkPreBanParams, [ PostBulkPreBanSummaryOptions? options ]) async {
     final includeByUserIdAndEmail = options?.includeByUserIdAndEmail;
     final includeByIP = options?.includeByIP;
     final includeByEmailDomain = options?.includeByEmailDomain;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/bulk-pre-ban-summary';
+    final path = r'/auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary';
 
     // ignore: prefer_final_locals
     Object? postBody = bulkPreBanParams;
@@ -2137,6 +2046,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (includeByUserIdAndEmail != null) {
       queryParams.addAll(_queryParams('', 'includeByUserIdAndEmail', includeByUserIdAndEmail));
     }
@@ -2146,9 +2056,6 @@ class ModerationApi {
     if (includeByEmailDomain != null) {
       queryParams.addAll(_queryParams('', 'includeByEmailDomain', includeByEmailDomain));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2169,6 +2076,8 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [BulkPreBanParams] bulkPreBanParams (required):
   ///
   /// * [bool] includeByUserIdAndEmail:
@@ -2177,11 +2086,9 @@ class ModerationApi {
   ///
   /// * [bool] includeByEmailDomain:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<BulkPreBanSummary?> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, [ ApiPostBulkPreBanSummaryOptions? options ]) async {
-    final response = await postBulkPreBanSummaryWithHttpInfo(bulkPreBanParams, options);
+  Future<BulkPreBanSummary?> postBulkPreBanSummary(String tenantId, BulkPreBanParams bulkPreBanParams, [ PostBulkPreBanSummaryOptions? options ]) async {
+    final response = await postBulkPreBanSummaryWithHttpInfo(tenantId, bulkPreBanParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2195,19 +2102,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/comments-by-ids' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/comments-by-ids' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [CommentsByIdsParams] commentsByIdsParams (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [CommentsByIdsParams] commentsByIdsParams (required):
   ///
   /// * [String] sso:
-  Future<Response> postCommentsByIdsWithHttpInfo(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> postCommentsByIdsWithHttpInfo(String tenantId, CommentsByIdsParams commentsByIdsParams, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/comments-by-ids';
+    final path = r'/auth/my-account/moderate-comments/mod_api/comments-by-ids';
 
     // ignore: prefer_final_locals
     Object? postBody = commentsByIdsParams;
@@ -2216,9 +2121,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -2239,13 +2142,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [CommentsByIdsParams] commentsByIdsParams (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [CommentsByIdsParams] commentsByIdsParams (required):
   ///
   /// * [String] sso:
-  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, [ ApiPostCommentsByIdsOptions? options ]) async {
-    final response = await postCommentsByIdsWithHttpInfo(commentsByIdsParams, options);
+  Future<ModerationAPIChildCommentsResponse?> postCommentsByIds(String tenantId, CommentsByIdsParams commentsByIdsParams, [ String? sso ]) async {
+    final response = await postCommentsByIdsWithHttpInfo(tenantId, commentsByIdsParams, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2259,22 +2162,21 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/flag-comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/flag-comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postFlagCommentWithHttpInfo(String commentId, [ ApiPostFlagCommentOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> postFlagCommentWithHttpInfo(String tenantId, String commentId, [ PostFlagCommentOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/flag-comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2284,9 +2186,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2310,15 +2210,15 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postFlagComment(String commentId, [ ApiPostFlagCommentOptions? options ]) async {
-    final response = await postFlagCommentWithHttpInfo(commentId, options);
+  Future<APIEmptyResponse?> postFlagComment(String tenantId, String commentId, [ PostFlagCommentOptions? options ]) async {
+    final response = await postFlagCommentWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2332,22 +2232,21 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/remove-comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/remove-comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postRemoveCommentWithHttpInfo(String commentId, [ ApiPostRemoveCommentOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> postRemoveCommentWithHttpInfo(String tenantId, String commentId, [ PostRemoveCommentOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/remove-comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/remove-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2357,9 +2256,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2383,15 +2280,15 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<PostRemoveCommentResponse?> postRemoveComment(String commentId, [ ApiPostRemoveCommentOptions? options ]) async {
-    final response = await postRemoveCommentWithHttpInfo(commentId, options);
+  Future<PostRemoveCommentApiResponse?> postRemoveComment(String tenantId, String commentId, [ PostRemoveCommentOptions? options ]) async {
+    final response = await postRemoveCommentWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2399,28 +2296,27 @@ class ModerationApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'PostRemoveCommentResponse',) as PostRemoveCommentResponse;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'PostRemoveCommentApiResponse',) as PostRemoveCommentApiResponse;
     
     }
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/restore-deleted-comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postRestoreDeletedCommentWithHttpInfo(String commentId, [ ApiPostRestoreDeletedCommentOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> postRestoreDeletedCommentWithHttpInfo(String tenantId, String commentId, [ PostRestoreDeletedCommentOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/restore-deleted-comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2430,9 +2326,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2456,15 +2350,15 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postRestoreDeletedComment(String commentId, [ ApiPostRestoreDeletedCommentOptions? options ]) async {
-    final response = await postRestoreDeletedCommentWithHttpInfo(commentId, options);
+  Future<APIEmptyResponse?> postRestoreDeletedComment(String tenantId, String commentId, [ PostRestoreDeletedCommentOptions? options ]) async {
+    final response = await postRestoreDeletedCommentWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2478,25 +2372,24 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/set-comment-approval-status/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] approved:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options ]) async {
+  Future<Response> postSetCommentApprovalStatusWithHttpInfo(String tenantId, String commentId, [ PostSetCommentApprovalStatusOptions? options ]) async {
     final approved = options?.approved;
-    final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/set-comment-approval-status/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2506,12 +2399,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (approved != null) {
       queryParams.addAll(_queryParams('', 'approved', approved));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2535,17 +2426,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] approved:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String commentId, [ ApiPostSetCommentApprovalStatusOptions? options ]) async {
-    final response = await postSetCommentApprovalStatusWithHttpInfo(commentId, options);
+  Future<SetCommentApprovedResponse?> postSetCommentApprovalStatus(String tenantId, String commentId, [ PostSetCommentApprovalStatusOptions? options ]) async {
+    final response = await postSetCommentApprovalStatusWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2559,25 +2450,24 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/set-comment-review-status/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] reviewed:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentReviewStatusWithHttpInfo(String commentId, [ ApiPostSetCommentReviewStatusOptions? options ]) async {
+  Future<Response> postSetCommentReviewStatusWithHttpInfo(String tenantId, String commentId, [ PostSetCommentReviewStatusOptions? options ]) async {
     final reviewed = options?.reviewed;
-    final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/set-comment-review-status/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2587,12 +2477,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (reviewed != null) {
       queryParams.addAll(_queryParams('', 'reviewed', reviewed));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2616,17 +2504,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] reviewed:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentReviewStatus(String commentId, [ ApiPostSetCommentReviewStatusOptions? options ]) async {
-    final response = await postSetCommentReviewStatusWithHttpInfo(commentId, options);
+  Future<APIEmptyResponse?> postSetCommentReviewStatus(String tenantId, String commentId, [ PostSetCommentReviewStatusOptions? options ]) async {
+    final response = await postSetCommentReviewStatusWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2640,28 +2528,27 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/set-comment-spam-status/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] spam:
   ///
   /// * [bool] permNotSpam:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentSpamStatusWithHttpInfo(String commentId, [ ApiPostSetCommentSpamStatusOptions? options ]) async {
+  Future<Response> postSetCommentSpamStatusWithHttpInfo(String tenantId, String commentId, [ PostSetCommentSpamStatusOptions? options ]) async {
     final spam = options?.spam;
     final permNotSpam = options?.permNotSpam;
-    final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/set-comment-spam-status/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2671,15 +2558,13 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (spam != null) {
       queryParams.addAll(_queryParams('', 'spam', spam));
     }
     if (permNotSpam != null) {
       queryParams.addAll(_queryParams('', 'permNotSpam', permNotSpam));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2703,19 +2588,19 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [bool] spam:
   ///
   /// * [bool] permNotSpam:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postSetCommentSpamStatus(String commentId, [ ApiPostSetCommentSpamStatusOptions? options ]) async {
-    final response = await postSetCommentSpamStatusWithHttpInfo(commentId, options);
+  Future<APIEmptyResponse?> postSetCommentSpamStatus(String tenantId, String commentId, [ PostSetCommentSpamStatusOptions? options ]) async {
+    final response = await postSetCommentSpamStatusWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2729,24 +2614,23 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/set-comment-text/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [SetCommentTextParams] setCommentTextParams (required):
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postSetCommentTextWithHttpInfo(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> postSetCommentTextWithHttpInfo(String tenantId, String commentId, SetCommentTextParams setCommentTextParams, [ PostSetCommentTextOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/set-comment-text/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2756,9 +2640,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2782,17 +2664,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [SetCommentTextParams] setCommentTextParams (required):
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<SetCommentTextResponse?> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, [ ApiPostSetCommentTextOptions? options ]) async {
-    final response = await postSetCommentTextWithHttpInfo(commentId, setCommentTextParams, options);
+  Future<SetCommentTextResponse?> postSetCommentText(String tenantId, String commentId, SetCommentTextParams setCommentTextParams, [ PostSetCommentTextOptions? options ]) async {
+    final response = await postSetCommentTextWithHttpInfo(tenantId, commentId, setCommentTextParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2806,22 +2688,21 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/un-flag-comment/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postUnFlagCommentWithHttpInfo(String commentId, [ ApiPostUnFlagCommentOptions? options ]) async {
-    final tenantId = options?.tenantId;
+  Future<Response> postUnFlagCommentWithHttpInfo(String tenantId, String commentId, [ PostUnFlagCommentOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/un-flag-comment/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2831,9 +2712,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2857,15 +2736,15 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] commentId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] commentId (required):
   ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> postUnFlagComment(String commentId, [ ApiPostUnFlagCommentOptions? options ]) async {
-    final response = await postUnFlagCommentWithHttpInfo(commentId, options);
+  Future<APIEmptyResponse?> postUnFlagComment(String tenantId, String commentId, [ PostUnFlagCommentOptions? options ]) async {
+    final response = await postUnFlagCommentWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2879,25 +2758,24 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/vote/{commentId}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /auth/my-account/moderate-comments/mod_api/vote/{commentId}' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [String] direction:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> postVoteWithHttpInfo(String commentId, [ ApiPostVoteOptions? options ]) async {
+  Future<Response> postVoteWithHttpInfo(String tenantId, String commentId, [ PostVoteOptions? options ]) async {
     final direction = options?.direction;
-    final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/vote/{commentId}'
+    final path = r'/auth/my-account/moderate-comments/mod_api/vote/{commentId}'
       .replaceAll('{commentId}', commentId);
 
     // ignore: prefer_final_locals
@@ -2907,12 +2785,10 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (direction != null) {
       queryParams.addAll(_queryParams('', 'direction', direction));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -2936,17 +2812,17 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] commentId (required):
   ///
   /// * [String] direction:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> postVote(String commentId, [ ApiPostVoteOptions? options ]) async {
-    final response = await postVoteWithHttpInfo(commentId, options);
+  Future<VoteResponse?> postVote(String tenantId, String commentId, [ PostVoteOptions? options ]) async {
+    final response = await postVoteWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -2960,28 +2836,27 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/award-badge' operation and returns the [Response].
+  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/mod_api/award-badge' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] badgeId (required):
   ///
   /// * [String] userId:
   ///
   /// * [String] commentId:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> putAwardBadgeWithHttpInfo(String badgeId, [ ApiPutAwardBadgeOptions? options ]) async {
+  Future<Response> putAwardBadgeWithHttpInfo(String tenantId, String badgeId, [ PutAwardBadgeOptions? options ]) async {
     final userId = options?.userId;
     final commentId = options?.commentId;
-    final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/award-badge';
+    final path = r'/auth/my-account/moderate-comments/mod_api/award-badge';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -2990,6 +2865,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
       queryParams.addAll(_queryParams('', 'badgeId', badgeId));
     if (userId != null) {
       queryParams.addAll(_queryParams('', 'userId', userId));
@@ -2997,9 +2873,6 @@ class ModerationApi {
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -3023,19 +2896,19 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] badgeId (required):
   ///
   /// * [String] userId:
   ///
   /// * [String] commentId:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<AwardUserBadgeResponse?> putAwardBadge(String badgeId, [ ApiPutAwardBadgeOptions? options ]) async {
-    final response = await putAwardBadgeWithHttpInfo(badgeId, options);
+  Future<AwardUserBadgeResponse?> putAwardBadge(String tenantId, String badgeId, [ PutAwardBadgeOptions? options ]) async {
+    final response = await putAwardBadgeWithHttpInfo(tenantId, badgeId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3049,19 +2922,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/close-thread' operation and returns the [Response].
+  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/mod_api/close-thread' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] urlId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] urlId (required):
   ///
   /// * [String] sso:
-  Future<Response> putCloseThreadWithHttpInfo(String urlId, [ ApiPutCloseThreadOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> putCloseThreadWithHttpInfo(String tenantId, String urlId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/close-thread';
+    final path = r'/auth/my-account/moderate-comments/mod_api/close-thread';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -3070,10 +2941,8 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-      queryParams.addAll(_queryParams('', 'urlId', urlId));
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
+      queryParams.addAll(_queryParams('', 'urlId', urlId));
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -3094,13 +2963,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] urlId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] urlId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putCloseThread(String urlId, [ ApiPutCloseThreadOptions? options ]) async {
-    final response = await putCloseThreadWithHttpInfo(urlId, options);
+  Future<APIEmptyResponse?> putCloseThread(String tenantId, String urlId, [ String? sso ]) async {
+    final response = await putCloseThreadWithHttpInfo(tenantId, urlId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3114,28 +2983,27 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/remove-badge' operation and returns the [Response].
+  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/mod_api/remove-badge' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] badgeId (required):
   ///
   /// * [String] userId:
   ///
   /// * [String] commentId:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> putRemoveBadgeWithHttpInfo(String badgeId, [ ApiPutRemoveBadgeOptions? options ]) async {
+  Future<Response> putRemoveBadgeWithHttpInfo(String tenantId, String badgeId, [ PutRemoveBadgeOptions? options ]) async {
     final userId = options?.userId;
     final commentId = options?.commentId;
-    final tenantId = options?.tenantId;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/remove-badge';
+    final path = r'/auth/my-account/moderate-comments/mod_api/remove-badge';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -3144,6 +3012,7 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
       queryParams.addAll(_queryParams('', 'badgeId', badgeId));
     if (userId != null) {
       queryParams.addAll(_queryParams('', 'userId', userId));
@@ -3151,9 +3020,6 @@ class ModerationApi {
     if (commentId != null) {
       queryParams.addAll(_queryParams('', 'commentId', commentId));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (broadcastId != null) {
       queryParams.addAll(_queryParams('', 'broadcastId', broadcastId));
     }
@@ -3177,19 +3043,19 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] badgeId (required):
   ///
   /// * [String] userId:
   ///
   /// * [String] commentId:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<RemoveUserBadgeResponse?> putRemoveBadge(String badgeId, [ ApiPutRemoveBadgeOptions? options ]) async {
-    final response = await putRemoveBadgeWithHttpInfo(badgeId, options);
+  Future<RemoveUserBadgeResponse?> putRemoveBadge(String tenantId, String badgeId, [ PutRemoveBadgeOptions? options ]) async {
+    final response = await putRemoveBadgeWithHttpInfo(tenantId, badgeId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3203,19 +3069,17 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/reopen-thread' operation and returns the [Response].
+  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/mod_api/reopen-thread' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [String] urlId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] urlId (required):
   ///
   /// * [String] sso:
-  Future<Response> putReopenThreadWithHttpInfo(String urlId, [ ApiPutReopenThreadOptions? options ]) async {
-    final tenantId = options?.tenantId;
-    final sso = options?.sso;
+  Future<Response> putReopenThreadWithHttpInfo(String tenantId, String urlId, [ String? sso ]) async {
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/reopen-thread';
+    final path = r'/auth/my-account/moderate-comments/mod_api/reopen-thread';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -3224,10 +3088,8 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-      queryParams.addAll(_queryParams('', 'urlId', urlId));
-    if (tenantId != null) {
       queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
+      queryParams.addAll(_queryParams('', 'urlId', urlId));
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -3248,13 +3110,13 @@ class ModerationApi {
 
   /// Parameters:
   ///
-  /// * [String] urlId (required):
+  /// * [String] tenantId (required):
   ///
-  /// * [String] tenantId:
+  /// * [String] urlId (required):
   ///
   /// * [String] sso:
-  Future<APIEmptyResponse?> putReopenThread(String urlId, [ ApiPutReopenThreadOptions? options ]) async {
-    final response = await putReopenThreadWithHttpInfo(urlId, options);
+  Future<APIEmptyResponse?> putReopenThread(String tenantId, String urlId, [ String? sso ]) async {
+    final response = await putReopenThreadWithHttpInfo(tenantId, urlId, sso);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3268,23 +3130,22 @@ class ModerationApi {
     return null;
   }
 
-  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/set-trust-factor' operation and returns the [Response].
+  /// Performs an HTTP 'PUT /auth/my-account/moderate-comments/mod_api/set-trust-factor' operation and returns the [Response].
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] userId:
   ///
   /// * [String] trustFactor:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<Response> setTrustFactorWithHttpInfo([ ApiSetTrustFactorOptions? options ]) async {
+  Future<Response> setTrustFactorWithHttpInfo(String tenantId, [ SetTrustFactorOptions? options ]) async {
     final userId = options?.userId;
     final trustFactor = options?.trustFactor;
-    final tenantId = options?.tenantId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
-    final path = r'/auth/my-account/moderate-comments/set-trust-factor';
+    final path = r'/auth/my-account/moderate-comments/mod_api/set-trust-factor';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -3293,15 +3154,13 @@ class ModerationApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
     if (userId != null) {
       queryParams.addAll(_queryParams('', 'userId', userId));
     }
     if (trustFactor != null) {
       queryParams.addAll(_queryParams('', 'trustFactor', trustFactor));
     }
-    if (tenantId != null) {
-      queryParams.addAll(_queryParams('', 'tenantId', tenantId));
-    }
     if (sso != null) {
       queryParams.addAll(_queryParams('', 'sso', sso));
     }
@@ -3322,15 +3181,15 @@ class ModerationApi {
 
   /// Parameters:
   ///
+  /// * [String] tenantId (required):
+  ///
   /// * [String] userId:
   ///
   /// * [String] trustFactor:
   ///
-  /// * [String] tenantId:
-  ///
   /// * [String] sso:
-  Future<SetUserTrustFactorResponse?> setTrustFactor([ ApiSetTrustFactorOptions? options ]) async {
-    final response = await setTrustFactorWithHttpInfo(options);
+  Future<SetUserTrustFactorResponse?> setTrustFactor(String tenantId, [ SetTrustFactorOptions? options ]) async {
+    final response = await setTrustFactorWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -3346,20 +3205,18 @@ class ModerationApi {
 }
 
 /// Optional parameters for [ModerationApi.deleteModerationVote].
-class ApiDeleteModerationVoteOptions {
-  const ApiDeleteModerationVoteOptions({
-    this.tenantId,
+class DeleteModerationVoteOptions {
+  const DeleteModerationVoteOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getApiComments].
-class ApiGetApiCommentsOptions {
-  const ApiGetApiCommentsOptions({
+class GetApiCommentsOptions {
+  const GetApiCommentsOptions({
     this.page,
     this.count,
     this.textSearch,
@@ -3368,7 +3225,6 @@ class ApiGetApiCommentsOptions {
     this.searchFilters,
     this.sorts,
     this.demo,
-    this.tenantId,
     this.sso,
   });
   final double? page;
@@ -3379,32 +3235,28 @@ class ApiGetApiCommentsOptions {
   final String? searchFilters;
   final String? sorts;
   final bool? demo;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getApiExportStatus].
-class ApiGetApiExportStatusOptions {
-  const ApiGetApiExportStatusOptions({
+class GetApiExportStatusOptions {
+  const GetApiExportStatusOptions({
     this.batchJobId,
-    this.tenantId,
     this.sso,
   });
   final String? batchJobId;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getApiIds].
-class ApiGetApiIdsOptions {
-  const ApiGetApiIdsOptions({
+class GetApiIdsOptions {
+  const GetApiIdsOptions({
     this.textSearch,
     this.byIPFromComment,
     this.filters,
     this.searchFilters,
     this.afterId,
     this.demo,
-    this.tenantId,
     this.sso,
   });
   final String? textSearch;
@@ -3413,49 +3265,17 @@ class ApiGetApiIdsOptions {
   final String? searchFilters;
   final String? afterId;
   final bool? demo;
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getBanUsersFromComment].
-class ApiGetBanUsersFromCommentOptions {
-  const ApiGetBanUsersFromCommentOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getCommentBanStatus].
-class ApiGetCommentBanStatusOptions {
-  const ApiGetCommentBanStatusOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getCommentChildren].
-class ApiGetCommentChildrenOptions {
-  const ApiGetCommentChildrenOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getCount].
-class ApiGetCountOptions {
-  const ApiGetCountOptions({
+class GetCountOptions {
+  const GetCountOptions({
     this.textSearch,
     this.byIPFromComment,
     this.filter,
     this.searchFilters,
     this.demo,
-    this.tenantId,
     this.sso,
   });
   final String? textSearch;
@@ -3463,213 +3283,139 @@ class ApiGetCountOptions {
   final String? filter;
   final String? searchFilters;
   final bool? demo;
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getCounts].
-class ApiGetCountsOptions {
-  const ApiGetCountsOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getLogs].
-class ApiGetLogsOptions {
-  const ApiGetLogsOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getManualBadges].
-class ApiGetManualBadgesOptions {
-  const ApiGetManualBadgesOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getManualBadgesForUser].
-class ApiGetManualBadgesForUserOptions {
-  const ApiGetManualBadgesForUserOptions({
+class GetManualBadgesForUserOptions {
+  const GetManualBadgesForUserOptions({
     this.badgesUserId,
     this.commentId,
-    this.tenantId,
     this.sso,
   });
   final String? badgesUserId;
   final String? commentId;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getModerationComment].
-class ApiGetModerationCommentOptions {
-  const ApiGetModerationCommentOptions({
+class GetModerationCommentOptions {
+  const GetModerationCommentOptions({
     this.includeEmail,
     this.includeIP,
-    this.tenantId,
     this.sso,
   });
   final bool? includeEmail;
   final bool? includeIP;
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getModerationCommentText].
-class ApiGetModerationCommentTextOptions {
-  const ApiGetModerationCommentTextOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getPreBanSummary].
-class ApiGetPreBanSummaryOptions {
-  const ApiGetPreBanSummaryOptions({
+class GetPreBanSummaryOptions {
+  const GetPreBanSummaryOptions({
     this.includeByUserIdAndEmail,
     this.includeByIP,
     this.includeByEmailDomain,
-    this.tenantId,
     this.sso,
   });
   final bool? includeByUserIdAndEmail;
   final bool? includeByIP;
   final bool? includeByEmailDomain;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getSearchCommentsSummary].
-class ApiGetSearchCommentsSummaryOptions {
-  const ApiGetSearchCommentsSummaryOptions({
+class GetSearchCommentsSummaryOptions {
+  const GetSearchCommentsSummaryOptions({
     this.value,
     this.filters,
     this.searchFilters,
-    this.tenantId,
     this.sso,
   });
   final String? value;
   final String? filters;
   final String? searchFilters;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getSearchPages].
-class ApiGetSearchPagesOptions {
-  const ApiGetSearchPagesOptions({
+class GetSearchPagesOptions {
+  const GetSearchPagesOptions({
     this.value,
-    this.tenantId,
     this.sso,
   });
   final String? value;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getSearchSites].
-class ApiGetSearchSitesOptions {
-  const ApiGetSearchSitesOptions({
+class GetSearchSitesOptions {
+  const GetSearchSitesOptions({
     this.value,
-    this.tenantId,
     this.sso,
   });
   final String? value;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getSearchSuggest].
-class ApiGetSearchSuggestOptions {
-  const ApiGetSearchSuggestOptions({
+class GetSearchSuggestOptions {
+  const GetSearchSuggestOptions({
     this.textSearch,
-    this.tenantId,
     this.sso,
   });
   final String? textSearch;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getSearchUsers].
-class ApiGetSearchUsersOptions {
-  const ApiGetSearchUsersOptions({
+class GetSearchUsersOptions {
+  const GetSearchUsersOptions({
     this.value,
-    this.tenantId,
     this.sso,
   });
   final String? value;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getTrustFactor].
-class ApiGetTrustFactorOptions {
-  const ApiGetTrustFactorOptions({
+class GetTrustFactorOptions {
+  const GetTrustFactorOptions({
     this.userId,
-    this.tenantId,
     this.sso,
   });
   final String? userId;
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.getUserBanPreference].
-class ApiGetUserBanPreferenceOptions {
-  const ApiGetUserBanPreferenceOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.getUserInternalProfile].
-class ApiGetUserInternalProfileOptions {
-  const ApiGetUserInternalProfileOptions({
+class GetUserInternalProfileOptions {
+  const GetUserInternalProfileOptions({
     this.commentId,
-    this.tenantId,
     this.sso,
   });
   final String? commentId;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postAdjustCommentVotes].
-class ApiPostAdjustCommentVotesOptions {
-  const ApiPostAdjustCommentVotesOptions({
-    this.tenantId,
+class PostAdjustCommentVotesOptions {
+  const PostAdjustCommentVotesOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postApiExport].
-class ApiPostApiExportOptions {
-  const ApiPostApiExportOptions({
+class PostApiExportOptions {
+  const PostApiExportOptions({
     this.textSearch,
     this.byIPFromComment,
     this.filters,
     this.searchFilters,
     this.sorts,
-    this.tenantId,
     this.sso,
   });
   final String? textSearch;
@@ -3677,13 +3423,12 @@ class ApiPostApiExportOptions {
   final String? filters;
   final String? searchFilters;
   final String? sorts;
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postBanUserFromComment].
-class ApiPostBanUserFromCommentOptions {
-  const ApiPostBanUserFromCommentOptions({
+class PostBanUserFromCommentOptions {
+  const PostBanUserFromCommentOptions({
     this.banEmail,
     this.banEmailDomain,
     this.banIP,
@@ -3692,7 +3437,6 @@ class ApiPostBanUserFromCommentOptions {
     this.isShadowBan,
     this.updateId,
     this.banReason,
-    this.tenantId,
     this.sso,
   });
   final bool? banEmail;
@@ -3703,226 +3447,159 @@ class ApiPostBanUserFromCommentOptions {
   final bool? isShadowBan;
   final String? updateId;
   final String? banReason;
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.postBanUserUndo].
-class ApiPostBanUserUndoOptions {
-  const ApiPostBanUserUndoOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postBulkPreBanSummary].
-class ApiPostBulkPreBanSummaryOptions {
-  const ApiPostBulkPreBanSummaryOptions({
+class PostBulkPreBanSummaryOptions {
+  const PostBulkPreBanSummaryOptions({
     this.includeByUserIdAndEmail,
     this.includeByIP,
     this.includeByEmailDomain,
-    this.tenantId,
     this.sso,
   });
   final bool? includeByUserIdAndEmail;
   final bool? includeByIP;
   final bool? includeByEmailDomain;
-  final String? tenantId;
-  final String? sso;
-}
-
-/// Optional parameters for [ModerationApi.postCommentsByIds].
-class ApiPostCommentsByIdsOptions {
-  const ApiPostCommentsByIdsOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postFlagComment].
-class ApiPostFlagCommentOptions {
-  const ApiPostFlagCommentOptions({
-    this.tenantId,
+class PostFlagCommentOptions {
+  const PostFlagCommentOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postRemoveComment].
-class ApiPostRemoveCommentOptions {
-  const ApiPostRemoveCommentOptions({
-    this.tenantId,
+class PostRemoveCommentOptions {
+  const PostRemoveCommentOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postRestoreDeletedComment].
-class ApiPostRestoreDeletedCommentOptions {
-  const ApiPostRestoreDeletedCommentOptions({
-    this.tenantId,
+class PostRestoreDeletedCommentOptions {
+  const PostRestoreDeletedCommentOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postSetCommentApprovalStatus].
-class ApiPostSetCommentApprovalStatusOptions {
-  const ApiPostSetCommentApprovalStatusOptions({
+class PostSetCommentApprovalStatusOptions {
+  const PostSetCommentApprovalStatusOptions({
     this.approved,
-    this.tenantId,
     this.broadcastId,
     this.sso,
   });
   final bool? approved;
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postSetCommentReviewStatus].
-class ApiPostSetCommentReviewStatusOptions {
-  const ApiPostSetCommentReviewStatusOptions({
+class PostSetCommentReviewStatusOptions {
+  const PostSetCommentReviewStatusOptions({
     this.reviewed,
-    this.tenantId,
     this.broadcastId,
     this.sso,
   });
   final bool? reviewed;
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postSetCommentSpamStatus].
-class ApiPostSetCommentSpamStatusOptions {
-  const ApiPostSetCommentSpamStatusOptions({
+class PostSetCommentSpamStatusOptions {
+  const PostSetCommentSpamStatusOptions({
     this.spam,
     this.permNotSpam,
-    this.tenantId,
     this.broadcastId,
     this.sso,
   });
   final bool? spam;
   final bool? permNotSpam;
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postSetCommentText].
-class ApiPostSetCommentTextOptions {
-  const ApiPostSetCommentTextOptions({
-    this.tenantId,
+class PostSetCommentTextOptions {
+  const PostSetCommentTextOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postUnFlagComment].
-class ApiPostUnFlagCommentOptions {
-  const ApiPostUnFlagCommentOptions({
-    this.tenantId,
+class PostUnFlagCommentOptions {
+  const PostUnFlagCommentOptions({
     this.broadcastId,
     this.sso,
   });
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.postVote].
-class ApiPostVoteOptions {
-  const ApiPostVoteOptions({
+class PostVoteOptions {
+  const PostVoteOptions({
     this.direction,
-    this.tenantId,
     this.broadcastId,
     this.sso,
   });
   final String? direction;
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
 /// Optional parameters for [ModerationApi.putAwardBadge].
-class ApiPutAwardBadgeOptions {
-  const ApiPutAwardBadgeOptions({
+class PutAwardBadgeOptions {
+  const PutAwardBadgeOptions({
     this.userId,
     this.commentId,
-    this.tenantId,
     this.broadcastId,
     this.sso,
   });
   final String? userId;
   final String? commentId;
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Optional parameters for [ModerationApi.putCloseThread].
-class ApiPutCloseThreadOptions {
-  const ApiPutCloseThreadOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
-  final String? sso;
-}
-
 /// Optional parameters for [ModerationApi.putRemoveBadge].
-class ApiPutRemoveBadgeOptions {
-  const ApiPutRemoveBadgeOptions({
+class PutRemoveBadgeOptions {
+  const PutRemoveBadgeOptions({
     this.userId,
     this.commentId,
-    this.tenantId,
     this.broadcastId,
     this.sso,
   });
   final String? userId;
   final String? commentId;
-  final String? tenantId;
   final String? broadcastId;
   final String? sso;
 }
 
-/// Optional parameters for [ModerationApi.putReopenThread].
-class ApiPutReopenThreadOptions {
-  const ApiPutReopenThreadOptions({
-    this.tenantId,
-    this.sso,
-  });
-  final String? tenantId;
-  final String? sso;
-}
-
 /// Optional parameters for [ModerationApi.setTrustFactor].
-class ApiSetTrustFactorOptions {
-  const ApiSetTrustFactorOptions({
+class SetTrustFactorOptions {
+  const SetTrustFactorOptions({
     this.userId,
     this.trustFactor,
-    this.tenantId,
     this.sso,
   });
   final String? userId;
   final String? trustFactor;
-  final String? tenantId;
   final String? sso;
 }
diff --git a/client/lib/api/public_api.dart b/client/lib/api/public_api.dart
index 1e6ee94..ba6a19c 100644
--- a/client/lib/api/public_api.dart
+++ b/client/lib/api/public_api.dart
@@ -158,7 +158,7 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> createCommentPublicWithHttpInfo(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options ]) async {
+  Future<Response> createCommentPublicWithHttpInfo(String tenantId, String urlId, String broadcastId, CommentData commentData, [ CreateCommentPublicOptions? options ]) async {
     final sessionId = options?.sessionId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -208,7 +208,7 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<SaveCommentsResponseWithPresence?> createCommentPublic(String tenantId, String urlId, String broadcastId, CommentData commentData, [ ApiCreateCommentPublicOptions? options ]) async {
+  Future<SaveCommentsResponseWithPresence?> createCommentPublic(String tenantId, String urlId, String broadcastId, CommentData commentData, [ CreateCommentPublicOptions? options ]) async {
     final response = await createCommentPublicWithHttpInfo(tenantId, urlId, broadcastId, commentData, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -233,7 +233,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> createFeedPostPublicWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options ]) async {
+  Future<Response> createFeedPostPublicWithHttpInfo(String tenantId, CreateFeedPostParams createFeedPostParams, [ CreateFeedPostPublicOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -277,7 +277,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> createFeedPostPublic(String tenantId, CreateFeedPostParams createFeedPostParams, [ ApiCreateFeedPostPublicOptions? options ]) async {
+  Future<CreateFeedPostResponse?> createFeedPostPublic(String tenantId, CreateFeedPostParams createFeedPostParams, [ CreateFeedPostPublicOptions? options ]) async {
     final response = await createFeedPostPublicWithHttpInfo(tenantId, createFeedPostParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -431,7 +431,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentPublicWithHttpInfo(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options ]) async {
+  Future<Response> deleteCommentPublicWithHttpInfo(String tenantId, String commentId, String broadcastId, [ DeleteCommentPublicOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -479,7 +479,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(String tenantId, String commentId, String broadcastId, [ ApiDeleteCommentPublicOptions? options ]) async {
+  Future<PublicAPIDeleteCommentResponse?> deleteCommentPublic(String tenantId, String commentId, String broadcastId, [ DeleteCommentPublicOptions? options ]) async {
     final response = await deleteCommentPublicWithHttpInfo(tenantId, commentId, broadcastId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -510,7 +510,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> deleteCommentVoteWithHttpInfo(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options ]) async {
+  Future<Response> deleteCommentVoteWithHttpInfo(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ DeleteCommentVoteOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -564,7 +564,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<VoteDeleteResponse?> deleteCommentVote(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ ApiDeleteCommentVoteOptions? options ]) async {
+  Future<VoteDeleteResponse?> deleteCommentVote(String tenantId, String commentId, String voteId, String urlId, String broadcastId, [ DeleteCommentVoteOptions? options ]) async {
     final response = await deleteCommentVoteWithHttpInfo(tenantId, commentId, voteId, urlId, broadcastId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -589,7 +589,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> deleteFeedPostPublicWithHttpInfo(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options ]) async {
+  Future<Response> deleteFeedPostPublicWithHttpInfo(String tenantId, String postId, [ DeleteFeedPostPublicOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -634,7 +634,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(String tenantId, String postId, [ ApiDeleteFeedPostPublicOptions? options ]) async {
+  Future<DeleteFeedPostPublicResponse?> deleteFeedPostPublic(String tenantId, String postId, [ DeleteFeedPostPublicOptions? options ]) async {
     final response = await deleteFeedPostPublicWithHttpInfo(tenantId, postId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -838,7 +838,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> getCommentTextWithHttpInfo(String tenantId, String commentId, [ ApiGetCommentTextOptions? options ]) async {
+  Future<Response> getCommentTextWithHttpInfo(String tenantId, String commentId, [ GetCommentTextOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -883,7 +883,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPIGetCommentTextResponse?> getCommentText(String tenantId, String commentId, [ ApiGetCommentTextOptions? options ]) async {
+  Future<PublicAPIGetCommentTextResponse?> getCommentText(String tenantId, String commentId, [ GetCommentTextOptions? options ]) async {
     final response = await getCommentTextWithHttpInfo(tenantId, commentId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -980,7 +980,7 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<Response> getCommentsForUserWithHttpInfo([ ApiGetCommentsForUserOptions? options ]) async {
+  Future<Response> getCommentsForUserWithHttpInfo([ GetCommentsForUserOptions? options ]) async {
     final userId = options?.userId;
     final direction = options?.direction;
     final repliesToUserId = options?.repliesToUserId;
@@ -1049,7 +1049,7 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] isCrawler:
-  Future<GetCommentsForUserResponse?> getCommentsForUser([ ApiGetCommentsForUserOptions? options ]) async {
+  Future<GetCommentsForUserResponse?> getCommentsForUser([ GetCommentsForUserOptions? options ]) async {
     final response = await getCommentsForUserWithHttpInfo(options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1125,7 +1125,7 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<Response> getCommentsPublicWithHttpInfo(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options ]) async {
+  Future<Response> getCommentsPublicWithHttpInfo(String tenantId, String urlId, [ GetCommentsPublicOptions? options ]) async {
     final page = options?.page;
     final direction = options?.direction;
     final sso = options?.sso;
@@ -1316,7 +1316,7 @@ class PublicApi {
   /// * [String] afterCommentId:
   ///
   /// * [String] beforeCommentId:
-  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(String tenantId, String urlId, [ ApiGetCommentsPublicOptions? options ]) async {
+  Future<GetCommentsResponseWithPresencePublicComment?> getCommentsPublic(String tenantId, String urlId, [ GetCommentsPublicOptions? options ]) async {
     final response = await getCommentsPublicWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1426,7 +1426,7 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<Response> getFeedPostsPublicWithHttpInfo(String tenantId, [ ApiGetFeedPostsPublicOptions? options ]) async {
+  Future<Response> getFeedPostsPublicWithHttpInfo(String tenantId, [ GetFeedPostsPublicOptions? options ]) async {
     final afterId = options?.afterId;
     final limit = options?.limit;
     final tags = options?.tags;
@@ -1494,7 +1494,7 @@ class PublicApi {
   /// * [bool] isCrawler:
   ///
   /// * [bool] includeUserInfo:
-  Future<PublicFeedPostsResponse?> getFeedPostsPublic(String tenantId, [ ApiGetFeedPostsPublicOptions? options ]) async {
+  Future<PublicFeedPostsResponse?> getFeedPostsPublic(String tenantId, [ GetFeedPostsPublicOptions? options ]) async {
     final response = await getFeedPostsPublicWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1636,7 +1636,7 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsSearchWithHttpInfo(String tenantId, String search, [ ApiGetGifsSearchOptions? options ]) async {
+  Future<Response> getGifsSearchWithHttpInfo(String tenantId, String search, [ GetGifsSearchOptions? options ]) async {
     final locale = options?.locale;
     final rating = options?.rating;
     final page = options?.page;
@@ -1687,7 +1687,7 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsSearchResponse?> getGifsSearch(String tenantId, String search, [ ApiGetGifsSearchOptions? options ]) async {
+  Future<GetGifsSearchResponse?> getGifsSearch(String tenantId, String search, [ GetGifsSearchOptions? options ]) async {
     final response = await getGifsSearchWithHttpInfo(tenantId, search, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1712,7 +1712,7 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<Response> getGifsTrendingWithHttpInfo(String tenantId, [ ApiGetGifsTrendingOptions? options ]) async {
+  Future<Response> getGifsTrendingWithHttpInfo(String tenantId, [ GetGifsTrendingOptions? options ]) async {
     final locale = options?.locale;
     final rating = options?.rating;
     final page = options?.page;
@@ -1760,7 +1760,7 @@ class PublicApi {
   /// * [String] rating:
   ///
   /// * [double] page:
-  Future<GetGifsTrendingResponse?> getGifsTrending(String tenantId, [ ApiGetGifsTrendingOptions? options ]) async {
+  Future<GetGifsTrendingResponse?> getGifsTrending(String tenantId, [ GetGifsTrendingOptions? options ]) async {
     final response = await getGifsTrendingWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1867,7 +1867,7 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOfflineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options ]) async {
+  Future<Response> getOfflineUsersWithHttpInfo(String tenantId, String urlId, [ GetOfflineUsersOptions? options ]) async {
     final afterName = options?.afterName;
     final afterUserId = options?.afterUserId;
     // ignore: prefer_const_declarations
@@ -1917,7 +1917,7 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOfflineResponse?> getOfflineUsers(String tenantId, String urlId, [ ApiGetOfflineUsersOptions? options ]) async {
+  Future<PageUsersOfflineResponse?> getOfflineUsers(String tenantId, String urlId, [ GetOfflineUsersOptions? options ]) async {
     final response = await getOfflineUsersWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1948,7 +1948,7 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<Response> getOnlineUsersWithHttpInfo(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options ]) async {
+  Future<Response> getOnlineUsersWithHttpInfo(String tenantId, String urlId, [ GetOnlineUsersOptions? options ]) async {
     final afterName = options?.afterName;
     final afterUserId = options?.afterUserId;
     // ignore: prefer_const_declarations
@@ -1998,7 +1998,7 @@ class PublicApi {
   ///
   /// * [String] afterUserId:
   ///   Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don't drop entries.
-  Future<PageUsersOnlineResponse?> getOnlineUsers(String tenantId, String urlId, [ ApiGetOnlineUsersOptions? options ]) async {
+  Future<PageUsersOnlineResponse?> getOnlineUsers(String tenantId, String urlId, [ GetOnlineUsersOptions? options ]) async {
     final response = await getOnlineUsersWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2035,7 +2035,7 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<Response> getPagesPublicWithHttpInfo(String tenantId, [ ApiGetPagesPublicOptions? options ]) async {
+  Future<Response> getPagesPublicWithHttpInfo(String tenantId, [ GetPagesPublicOptions? options ]) async {
     final cursor = options?.cursor;
     final limit = options?.limit;
     final q = options?.q;
@@ -2102,7 +2102,7 @@ class PublicApi {
   ///
   /// * [bool] hasComments:
   ///   If true, only return pages with at least one comment.
-  Future<GetPublicPagesResponse?> getPagesPublic(String tenantId, [ ApiGetPagesPublicOptions? options ]) async {
+  Future<GetPublicPagesResponse?> getPagesPublic(String tenantId, [ GetPagesPublicOptions? options ]) async {
     final response = await getPagesPublicWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2127,7 +2127,7 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<Response> getTranslationsWithHttpInfo(String namespace, String component, [ ApiGetTranslationsOptions? options ]) async {
+  Future<Response> getTranslationsWithHttpInfo(String namespace, String component, [ GetTranslationsOptions? options ]) async {
     final locale = options?.locale;
     final useFullTranslationIds = options?.useFullTranslationIds;
     // ignore: prefer_const_declarations
@@ -2172,7 +2172,7 @@ class PublicApi {
   /// * [String] locale:
   ///
   /// * [bool] useFullTranslationIds:
-  Future<GetTranslationsResponse?> getTranslations(String namespace, String component, [ ApiGetTranslationsOptions? options ]) async {
+  Future<GetTranslationsResponse?> getTranslations(String namespace, String component, [ GetTranslationsOptions? options ]) async {
     final response = await getTranslationsWithHttpInfo(namespace, component, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2270,7 +2270,7 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<Response> getUserNotificationsWithHttpInfo(String tenantId, [ ApiGetUserNotificationsOptions? options ]) async {
+  Future<Response> getUserNotificationsWithHttpInfo(String tenantId, [ GetUserNotificationsOptions? options ]) async {
     final urlId = options?.urlId;
     final pageSize = options?.pageSize;
     final afterId = options?.afterId;
@@ -2367,7 +2367,7 @@ class PublicApi {
   /// * [bool] includeTenantNotifications:
   ///
   /// * [String] sso:
-  Future<GetMyNotificationsResponse?> getUserNotifications(String tenantId, [ ApiGetUserNotificationsOptions? options ]) async {
+  Future<GetMyNotificationsResponse?> getUserNotifications(String tenantId, [ GetUserNotificationsOptions? options ]) async {
     final response = await getUserNotificationsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2449,7 +2449,7 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<Response> getUserReactsPublicWithHttpInfo(String tenantId, [ ApiGetUserReactsPublicOptions? options ]) async {
+  Future<Response> getUserReactsPublicWithHttpInfo(String tenantId, [ GetUserReactsPublicOptions? options ]) async {
     final postIds = options?.postIds;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -2491,7 +2491,7 @@ class PublicApi {
   /// * [List<String>] postIds:
   ///
   /// * [String] sso:
-  Future<UserReactsResponse?> getUserReactsPublic(String tenantId, [ ApiGetUserReactsPublicOptions? options ]) async {
+  Future<UserReactsResponse?> getUserReactsPublic(String tenantId, [ GetUserReactsPublicOptions? options ]) async {
     final response = await getUserReactsPublicWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -2921,7 +2921,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> reactFeedPostPublicWithHttpInfo(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options ]) async {
+  Future<Response> reactFeedPostPublicWithHttpInfo(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ReactFeedPostPublicOptions? options ]) async {
     final isUndo = options?.isUndo;
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
@@ -2974,7 +2974,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<ReactFeedPostResponse?> reactFeedPostPublic(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ApiReactFeedPostPublicOptions? options ]) async {
+  Future<ReactFeedPostResponse?> reactFeedPostPublic(String tenantId, String postId, ReactBodyParams reactBodyParams, [ ReactFeedPostPublicOptions? options ]) async {
     final response = await reactFeedPostPublicWithHttpInfo(tenantId, postId, reactBodyParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3061,7 +3061,7 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<Response> resetUserNotificationsWithHttpInfo(String tenantId, [ ApiResetUserNotificationsOptions? options ]) async {
+  Future<Response> resetUserNotificationsWithHttpInfo(String tenantId, [ ResetUserNotificationsOptions? options ]) async {
     final afterId = options?.afterId;
     final afterCreatedAt = options?.afterCreatedAt;
     final unreadOnly = options?.unreadOnly;
@@ -3127,7 +3127,7 @@ class PublicApi {
   /// * [bool] noDm:
   ///
   /// * [String] sso:
-  Future<ResetUserNotificationsResponse?> resetUserNotifications(String tenantId, [ ApiResetUserNotificationsOptions? options ]) async {
+  Future<ResetUserNotificationsResponse?> resetUserNotifications(String tenantId, [ ResetUserNotificationsOptions? options ]) async {
     final response = await resetUserNotificationsWithHttpInfo(tenantId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3156,7 +3156,7 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<Response> searchUsersWithHttpInfo(String tenantId, String urlId, [ ApiSearchUsersOptions? options ]) async {
+  Future<Response> searchUsersWithHttpInfo(String tenantId, String urlId, [ SearchUsersOptions? options ]) async {
     final usernameStartsWith = options?.usernameStartsWith;
     final mentionGroupIds = options?.mentionGroupIds;
     final sso = options?.sso;
@@ -3213,7 +3213,7 @@ class PublicApi {
   /// * [String] sso:
   ///
   /// * [String] searchSection:
-  Future<SearchUsersResult?> searchUsers(String tenantId, String urlId, [ ApiSearchUsersOptions? options ]) async {
+  Future<SearchUsersResult?> searchUsers(String tenantId, String urlId, [ SearchUsersOptions? options ]) async {
     final response = await searchUsersWithHttpInfo(tenantId, urlId, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3242,7 +3242,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<Response> setCommentTextWithHttpInfo(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options ]) async {
+  Future<Response> setCommentTextWithHttpInfo(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ SetCommentTextOptions? options ]) async {
     final editKey = options?.editKey;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3292,7 +3292,7 @@ class PublicApi {
   /// * [String] editKey:
   ///
   /// * [String] sso:
-  Future<PublicAPISetCommentTextResponse?> setCommentText(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ ApiSetCommentTextOptions? options ]) async {
+  Future<PublicAPISetCommentTextResponse?> setCommentText(String tenantId, String commentId, String broadcastId, CommentTextUpdateRequest commentTextUpdateRequest, [ SetCommentTextOptions? options ]) async {
     final response = await setCommentTextWithHttpInfo(tenantId, commentId, broadcastId, commentTextUpdateRequest, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3516,7 +3516,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<Response> updateFeedPostPublicWithHttpInfo(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options ]) async {
+  Future<Response> updateFeedPostPublicWithHttpInfo(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ UpdateFeedPostPublicOptions? options ]) async {
     final broadcastId = options?.broadcastId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3563,7 +3563,7 @@ class PublicApi {
   /// * [String] broadcastId:
   ///
   /// * [String] sso:
-  Future<CreateFeedPostResponse?> updateFeedPostPublic(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ ApiUpdateFeedPostPublicOptions? options ]) async {
+  Future<CreateFeedPostResponse?> updateFeedPostPublic(String tenantId, String postId, UpdateFeedPostParams updateFeedPostParams, [ UpdateFeedPostPublicOptions? options ]) async {
     final response = await updateFeedPostPublicWithHttpInfo(tenantId, postId, updateFeedPostParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3816,7 +3816,7 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<Response> uploadImageWithHttpInfo(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options ]) async {
+  Future<Response> uploadImageWithHttpInfo(String tenantId, MultipartFile file, [ UploadImageOptions? options ]) async {
     final sizePreset = options?.sizePreset;
     final urlId = options?.urlId;
     // ignore: prefer_const_declarations
@@ -3874,7 +3874,7 @@ class PublicApi {
   ///
   /// * [String] urlId:
   ///   Page id that upload is happening from, to configure
-  Future<UploadImageResponse?> uploadImage(String tenantId, MultipartFile file, [ ApiUploadImageOptions? options ]) async {
+  Future<UploadImageResponse?> uploadImage(String tenantId, MultipartFile file, [ UploadImageOptions? options ]) async {
     final response = await uploadImageWithHttpInfo(tenantId, file, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3905,7 +3905,7 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<Response> voteCommentWithHttpInfo(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options ]) async {
+  Future<Response> voteCommentWithHttpInfo(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ VoteCommentOptions? options ]) async {
     final sessionId = options?.sessionId;
     final sso = options?.sso;
     // ignore: prefer_const_declarations
@@ -3958,7 +3958,7 @@ class PublicApi {
   /// * [String] sessionId:
   ///
   /// * [String] sso:
-  Future<VoteResponse?> voteComment(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ ApiVoteCommentOptions? options ]) async {
+  Future<VoteResponse?> voteComment(String tenantId, String commentId, String urlId, String broadcastId, VoteBodyParams voteBodyParams, [ VoteCommentOptions? options ]) async {
     final response = await voteCommentWithHttpInfo(tenantId, commentId, urlId, broadcastId, voteBodyParams, options);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -3975,8 +3975,8 @@ class PublicApi {
 }
 
 /// Optional parameters for [PublicApi.createCommentPublic].
-class ApiCreateCommentPublicOptions {
-  const ApiCreateCommentPublicOptions({
+class CreateCommentPublicOptions {
+  const CreateCommentPublicOptions({
     this.sessionId,
     this.sso,
   });
@@ -3985,8 +3985,8 @@ class ApiCreateCommentPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.createFeedPostPublic].
-class ApiCreateFeedPostPublicOptions {
-  const ApiCreateFeedPostPublicOptions({
+class CreateFeedPostPublicOptions {
+  const CreateFeedPostPublicOptions({
     this.broadcastId,
     this.sso,
   });
@@ -3995,8 +3995,8 @@ class ApiCreateFeedPostPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.deleteCommentPublic].
-class ApiDeleteCommentPublicOptions {
-  const ApiDeleteCommentPublicOptions({
+class DeleteCommentPublicOptions {
+  const DeleteCommentPublicOptions({
     this.editKey,
     this.sso,
   });
@@ -4005,8 +4005,8 @@ class ApiDeleteCommentPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.deleteCommentVote].
-class ApiDeleteCommentVoteOptions {
-  const ApiDeleteCommentVoteOptions({
+class DeleteCommentVoteOptions {
+  const DeleteCommentVoteOptions({
     this.editKey,
     this.sso,
   });
@@ -4015,8 +4015,8 @@ class ApiDeleteCommentVoteOptions {
 }
 
 /// Optional parameters for [PublicApi.deleteFeedPostPublic].
-class ApiDeleteFeedPostPublicOptions {
-  const ApiDeleteFeedPostPublicOptions({
+class DeleteFeedPostPublicOptions {
+  const DeleteFeedPostPublicOptions({
     this.broadcastId,
     this.sso,
   });
@@ -4025,8 +4025,8 @@ class ApiDeleteFeedPostPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.getCommentText].
-class ApiGetCommentTextOptions {
-  const ApiGetCommentTextOptions({
+class GetCommentTextOptions {
+  const GetCommentTextOptions({
     this.editKey,
     this.sso,
   });
@@ -4035,8 +4035,8 @@ class ApiGetCommentTextOptions {
 }
 
 /// Optional parameters for [PublicApi.getCommentsForUser].
-class ApiGetCommentsForUserOptions {
-  const ApiGetCommentsForUserOptions({
+class GetCommentsForUserOptions {
+  const GetCommentsForUserOptions({
     this.userId,
     this.direction,
     this.repliesToUserId,
@@ -4055,8 +4055,8 @@ class ApiGetCommentsForUserOptions {
 }
 
 /// Optional parameters for [PublicApi.getCommentsPublic].
-class ApiGetCommentsPublicOptions {
-  const ApiGetCommentsPublicOptions({
+class GetCommentsPublicOptions {
+  const GetCommentsPublicOptions({
     this.page,
     this.direction,
     this.sso,
@@ -4113,8 +4113,8 @@ class ApiGetCommentsPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.getFeedPostsPublic].
-class ApiGetFeedPostsPublicOptions {
-  const ApiGetFeedPostsPublicOptions({
+class GetFeedPostsPublicOptions {
+  const GetFeedPostsPublicOptions({
     this.afterId,
     this.limit,
     this.tags,
@@ -4131,8 +4131,8 @@ class ApiGetFeedPostsPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.getGifsSearch].
-class ApiGetGifsSearchOptions {
-  const ApiGetGifsSearchOptions({
+class GetGifsSearchOptions {
+  const GetGifsSearchOptions({
     this.locale,
     this.rating,
     this.page,
@@ -4143,8 +4143,8 @@ class ApiGetGifsSearchOptions {
 }
 
 /// Optional parameters for [PublicApi.getGifsTrending].
-class ApiGetGifsTrendingOptions {
-  const ApiGetGifsTrendingOptions({
+class GetGifsTrendingOptions {
+  const GetGifsTrendingOptions({
     this.locale,
     this.rating,
     this.page,
@@ -4155,8 +4155,8 @@ class ApiGetGifsTrendingOptions {
 }
 
 /// Optional parameters for [PublicApi.getOfflineUsers].
-class ApiGetOfflineUsersOptions {
-  const ApiGetOfflineUsersOptions({
+class GetOfflineUsersOptions {
+  const GetOfflineUsersOptions({
     this.afterName,
     this.afterUserId,
   });
@@ -4165,8 +4165,8 @@ class ApiGetOfflineUsersOptions {
 }
 
 /// Optional parameters for [PublicApi.getOnlineUsers].
-class ApiGetOnlineUsersOptions {
-  const ApiGetOnlineUsersOptions({
+class GetOnlineUsersOptions {
+  const GetOnlineUsersOptions({
     this.afterName,
     this.afterUserId,
   });
@@ -4175,8 +4175,8 @@ class ApiGetOnlineUsersOptions {
 }
 
 /// Optional parameters for [PublicApi.getPagesPublic].
-class ApiGetPagesPublicOptions {
-  const ApiGetPagesPublicOptions({
+class GetPagesPublicOptions {
+  const GetPagesPublicOptions({
     this.cursor,
     this.limit,
     this.q,
@@ -4191,8 +4191,8 @@ class ApiGetPagesPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.getTranslations].
-class ApiGetTranslationsOptions {
-  const ApiGetTranslationsOptions({
+class GetTranslationsOptions {
+  const GetTranslationsOptions({
     this.locale,
     this.useFullTranslationIds,
   });
@@ -4201,8 +4201,8 @@ class ApiGetTranslationsOptions {
 }
 
 /// Optional parameters for [PublicApi.getUserNotifications].
-class ApiGetUserNotificationsOptions {
-  const ApiGetUserNotificationsOptions({
+class GetUserNotificationsOptions {
+  const GetUserNotificationsOptions({
     this.urlId,
     this.pageSize,
     this.afterId,
@@ -4229,8 +4229,8 @@ class ApiGetUserNotificationsOptions {
 }
 
 /// Optional parameters for [PublicApi.getUserReactsPublic].
-class ApiGetUserReactsPublicOptions {
-  const ApiGetUserReactsPublicOptions({
+class GetUserReactsPublicOptions {
+  const GetUserReactsPublicOptions({
     this.postIds,
     this.sso,
   });
@@ -4239,8 +4239,8 @@ class ApiGetUserReactsPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.reactFeedPostPublic].
-class ApiReactFeedPostPublicOptions {
-  const ApiReactFeedPostPublicOptions({
+class ReactFeedPostPublicOptions {
+  const ReactFeedPostPublicOptions({
     this.isUndo,
     this.broadcastId,
     this.sso,
@@ -4251,8 +4251,8 @@ class ApiReactFeedPostPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.resetUserNotifications].
-class ApiResetUserNotificationsOptions {
-  const ApiResetUserNotificationsOptions({
+class ResetUserNotificationsOptions {
+  const ResetUserNotificationsOptions({
     this.afterId,
     this.afterCreatedAt,
     this.unreadOnly,
@@ -4269,8 +4269,8 @@ class ApiResetUserNotificationsOptions {
 }
 
 /// Optional parameters for [PublicApi.searchUsers].
-class ApiSearchUsersOptions {
-  const ApiSearchUsersOptions({
+class SearchUsersOptions {
+  const SearchUsersOptions({
     this.usernameStartsWith,
     this.mentionGroupIds,
     this.sso,
@@ -4283,8 +4283,8 @@ class ApiSearchUsersOptions {
 }
 
 /// Optional parameters for [PublicApi.setCommentText].
-class ApiSetCommentTextOptions {
-  const ApiSetCommentTextOptions({
+class SetCommentTextOptions {
+  const SetCommentTextOptions({
     this.editKey,
     this.sso,
   });
@@ -4293,8 +4293,8 @@ class ApiSetCommentTextOptions {
 }
 
 /// Optional parameters for [PublicApi.updateFeedPostPublic].
-class ApiUpdateFeedPostPublicOptions {
-  const ApiUpdateFeedPostPublicOptions({
+class UpdateFeedPostPublicOptions {
+  const UpdateFeedPostPublicOptions({
     this.broadcastId,
     this.sso,
   });
@@ -4303,8 +4303,8 @@ class ApiUpdateFeedPostPublicOptions {
 }
 
 /// Optional parameters for [PublicApi.uploadImage].
-class ApiUploadImageOptions {
-  const ApiUploadImageOptions({
+class UploadImageOptions {
+  const UploadImageOptions({
     this.sizePreset,
     this.urlId,
   });
@@ -4313,8 +4313,8 @@ class ApiUploadImageOptions {
 }
 
 /// Optional parameters for [PublicApi.voteComment].
-class ApiVoteCommentOptions {
-  const ApiVoteCommentOptions({
+class VoteCommentOptions {
+  const VoteCommentOptions({
     this.sessionId,
     this.sso,
   });
diff --git a/client/lib/api_client.dart b/client/lib/api_client.dart
index 5cfb051..029b79e 100644
--- a/client/lib/api_client.dart
+++ b/client/lib/api_client.dart
@@ -700,8 +700,8 @@ class ApiClient {
           return PatchSSOUserAPIResponse.fromJson(value);
         case 'PendingCommentToSyncOutbound':
           return PendingCommentToSyncOutbound.fromJson(value);
-        case 'PostRemoveCommentResponse':
-          return PostRemoveCommentResponse.fromJson(value);
+        case 'PostRemoveCommentApiResponse':
+          return PostRemoveCommentApiResponse.fromJson(value);
         case 'PreBanSummary':
           return PreBanSummary.fromJson(value);
         case 'PubSubComment':
diff --git a/client/lib/model/post_remove_comment_response.dart b/client/lib/model/post_remove_comment_api_response.dart
similarity index 62%
rename from client/lib/model/post_remove_comment_response.dart
rename to client/lib/model/post_remove_comment_api_response.dart
index 428bc31..1bf6e87 100644
--- a/client/lib/model/post_remove_comment_response.dart
+++ b/client/lib/model/post_remove_comment_api_response.dart
@@ -10,9 +10,9 @@
 
 part of openapi.api;
 
-class PostRemoveCommentResponse {
-  /// Returns a new [PostRemoveCommentResponse] instance.
-  PostRemoveCommentResponse({
+class PostRemoveCommentApiResponse {
+  /// Returns a new [PostRemoveCommentApiResponse] instance.
+  PostRemoveCommentApiResponse({
     required this.action,
     required this.status,
   });
@@ -22,7 +22,7 @@ class PostRemoveCommentResponse {
   String status;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is PostRemoveCommentResponse &&
+  bool operator ==(Object other) => identical(this, other) || other is PostRemoveCommentApiResponse &&
     other.action == action &&
       other.status == status;
   
@@ -35,7 +35,7 @@ class PostRemoveCommentResponse {
   
 
   @override
-  String toString() => 'PostRemoveCommentResponse[action=$action, status=$status]';
+  String toString() => 'PostRemoveCommentApiResponse[action=$action, status=$status]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -44,10 +44,10 @@ class PostRemoveCommentResponse {
     return json;
   }
 
-  /// Returns a new [PostRemoveCommentResponse] instance and imports its values from
+  /// Returns a new [PostRemoveCommentApiResponse] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static PostRemoveCommentResponse? fromJson(dynamic value) {
+  static PostRemoveCommentApiResponse? fromJson(dynamic value) {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
@@ -55,14 +55,14 @@ class PostRemoveCommentResponse {
       // Note 1: the values aren't checked for validity beyond being non-null.
       // Note 2: this code is stripped in release mode!
       assert(() {
-        assert(json.containsKey(r'action'), 'Required key "PostRemoveCommentResponse[action]" is missing from JSON.');
-        assert(json[r'action'] != null, 'Required key "PostRemoveCommentResponse[action]" has a null value in JSON.');
-        assert(json.containsKey(r'status'), 'Required key "PostRemoveCommentResponse[status]" is missing from JSON.');
-        assert(json[r'status'] != null, 'Required key "PostRemoveCommentResponse[status]" has a null value in JSON.');
+        assert(json.containsKey(r'action'), 'Required key "PostRemoveCommentApiResponse[action]" is missing from JSON.');
+        assert(json[r'action'] != null, 'Required key "PostRemoveCommentApiResponse[action]" has a null value in JSON.');
+        assert(json.containsKey(r'status'), 'Required key "PostRemoveCommentApiResponse[status]" is missing from JSON.');
+        assert(json[r'status'] != null, 'Required key "PostRemoveCommentApiResponse[status]" has a null value in JSON.');
         return true;
       }());
 
-      return PostRemoveCommentResponse(
+      return PostRemoveCommentApiResponse(
         action: mapValueOfType<String>(json, r'action')!,
         status: mapValueOfType<String>(json, r'status')!,
       );
@@ -70,11 +70,11 @@ class PostRemoveCommentResponse {
     return null;
   }
 
-  static List<PostRemoveCommentResponse> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <PostRemoveCommentResponse>[];
+  static List<PostRemoveCommentApiResponse> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <PostRemoveCommentApiResponse>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = PostRemoveCommentResponse.fromJson(row);
+        final value = PostRemoveCommentApiResponse.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -83,12 +83,12 @@ class PostRemoveCommentResponse {
     return result.toList(growable: growable);
   }
 
-  static Map<String, PostRemoveCommentResponse> mapFromJson(dynamic json) {
-    final map = <String, PostRemoveCommentResponse>{};
+  static Map<String, PostRemoveCommentApiResponse> mapFromJson(dynamic json) {
+    final map = <String, PostRemoveCommentApiResponse>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = PostRemoveCommentResponse.fromJson(entry.value);
+        final value = PostRemoveCommentApiResponse.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -97,14 +97,14 @@ class PostRemoveCommentResponse {
     return map;
   }
 
-  // maps a json object with a list of PostRemoveCommentResponse-objects as value to a dart map
-  static Map<String, List<PostRemoveCommentResponse>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<PostRemoveCommentResponse>>{};
+  // maps a json object with a list of PostRemoveCommentApiResponse-objects as value to a dart map
+  static Map<String, List<PostRemoveCommentApiResponse>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<PostRemoveCommentApiResponse>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = PostRemoveCommentResponse.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = PostRemoveCommentApiResponse.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/client/test/default_api_test.dart b/client/test/default_api_test.dart
index 9c735cb..5ec6d8b 100644
--- a/client/test/default_api_test.dart
+++ b/client/test/default_api_test.dart
@@ -22,12 +22,12 @@ void main() {
       // TODO
     });
 
-    //Future<CreateHashTagResponse> addHashTag({ String tenantId, CreateHashTagBody createHashTagBody }) async
+    //Future<CreateHashTagResponse> addHashTag(String tenantId, { CreateHashTagBody createHashTagBody }) async
     test('test addHashTag', () async {
       // TODO
     });
 
-    //Future<BulkCreateHashTagsResponse> addHashTagsBulk({ String tenantId, BulkCreateHashTagsBody bulkCreateHashTagsBody }) async
+    //Future<BulkCreateHashTagsResponse> addHashTagsBulk(String tenantId, { BulkCreateHashTagsBody bulkCreateHashTagsBody }) async
     test('test addHashTagsBulk', () async {
       // TODO
     });
@@ -154,7 +154,7 @@ void main() {
       // TODO
     });
 
-    //Future<APIEmptyResponse> deleteHashTag(String tag, { String tenantId, DeleteHashTagRequestBody deleteHashTagRequestBody }) async
+    //Future<APIEmptyResponse> deleteHashTag(String tenantId, String tag, { DeleteHashTagRequestBody deleteHashTagRequestBody }) async
     test('test deleteHashTag', () async {
       // TODO
     });
@@ -461,7 +461,7 @@ void main() {
       // TODO
     });
 
-    //Future<UpdateHashTagResponse> patchHashTag(String tag, { String tenantId, UpdateHashTagBody updateHashTagBody }) async
+    //Future<UpdateHashTagResponse> patchHashTag(String tenantId, String tag, { UpdateHashTagBody updateHashTagBody }) async
     test('test patchHashTag', () async {
       // TODO
     });
diff --git a/client/test/moderation_api_test.dart b/client/test/moderation_api_test.dart
index a2d32bc..34f8559 100644
--- a/client/test/moderation_api_test.dart
+++ b/client/test/moderation_api_test.dart
@@ -17,217 +17,217 @@ void main() {
   // final instance = ModerationApi();
 
   group('tests for ModerationApi', () {
-    //Future<VoteDeleteResponse> deleteModerationVote(String commentId, String voteId, { String tenantId, String broadcastId, String sso }) async
+    //Future<VoteDeleteResponse> deleteModerationVote(String tenantId, String commentId, String voteId, { String broadcastId, String sso }) async
     test('test deleteModerationVote', () async {
       // TODO
     });
 
-    //Future<ModerationAPIGetCommentsResponse> getApiComments({ double page, double count, String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, bool demo, String tenantId, String sso }) async
+    //Future<ModerationAPIGetCommentsResponse> getApiComments(String tenantId, { double page, double count, String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, bool demo, String sso }) async
     test('test getApiComments', () async {
       // TODO
     });
 
-    //Future<ModerationExportStatusResponse> getApiExportStatus({ String batchJobId, String tenantId, String sso }) async
+    //Future<ModerationExportStatusResponse> getApiExportStatus(String tenantId, { String batchJobId, String sso }) async
     test('test getApiExportStatus', () async {
       // TODO
     });
 
-    //Future<ModerationAPIGetCommentIdsResponse> getApiIds({ String textSearch, String byIPFromComment, String filters, String searchFilters, String afterId, bool demo, String tenantId, String sso }) async
+    //Future<ModerationAPIGetCommentIdsResponse> getApiIds(String tenantId, { String textSearch, String byIPFromComment, String filters, String searchFilters, String afterId, bool demo, String sso }) async
     test('test getApiIds', () async {
       // TODO
     });
 
-    //Future<GetBannedUsersFromCommentResponse> getBanUsersFromComment(String commentId, { String tenantId, String sso }) async
+    //Future<GetBannedUsersFromCommentResponse> getBanUsersFromComment(String tenantId, String commentId, { String sso }) async
     test('test getBanUsersFromComment', () async {
       // TODO
     });
 
-    //Future<GetCommentBanStatusResponse> getCommentBanStatus(String commentId, { String tenantId, String sso }) async
+    //Future<GetCommentBanStatusResponse> getCommentBanStatus(String tenantId, String commentId, { String sso }) async
     test('test getCommentBanStatus', () async {
       // TODO
     });
 
-    //Future<ModerationAPIChildCommentsResponse> getCommentChildren(String commentId, { String tenantId, String sso }) async
+    //Future<ModerationAPIChildCommentsResponse> getCommentChildren(String tenantId, String commentId, { String sso }) async
     test('test getCommentChildren', () async {
       // TODO
     });
 
-    //Future<ModerationAPICountCommentsResponse> getCount({ String textSearch, String byIPFromComment, String filter, String searchFilters, bool demo, String tenantId, String sso }) async
+    //Future<ModerationAPICountCommentsResponse> getCount(String tenantId, { String textSearch, String byIPFromComment, String filter, String searchFilters, bool demo, String sso }) async
     test('test getCount', () async {
       // TODO
     });
 
-    //Future<GetBannedUsersCountResponse> getCounts({ String tenantId, String sso }) async
+    //Future<GetBannedUsersCountResponse> getCounts(String tenantId, { String sso }) async
     test('test getCounts', () async {
       // TODO
     });
 
-    //Future<ModerationAPIGetLogsResponse> getLogs(String commentId, { String tenantId, String sso }) async
+    //Future<ModerationAPIGetLogsResponse> getLogs(String tenantId, String commentId, { String sso }) async
     test('test getLogs', () async {
       // TODO
     });
 
-    //Future<GetTenantManualBadgesResponse> getManualBadges({ String tenantId, String sso }) async
+    //Future<GetTenantManualBadgesResponse> getManualBadges(String tenantId, { String sso }) async
     test('test getManualBadges', () async {
       // TODO
     });
 
-    //Future<GetUserManualBadgesResponse> getManualBadgesForUser({ String badgesUserId, String commentId, String tenantId, String sso }) async
+    //Future<GetUserManualBadgesResponse> getManualBadgesForUser(String tenantId, { String badgesUserId, String commentId, String sso }) async
     test('test getManualBadgesForUser', () async {
       // TODO
     });
 
-    //Future<ModerationAPICommentResponse> getModerationComment(String commentId, { bool includeEmail, bool includeIP, String tenantId, String sso }) async
+    //Future<ModerationAPICommentResponse> getModerationComment(String tenantId, String commentId, { bool includeEmail, bool includeIP, String sso }) async
     test('test getModerationComment', () async {
       // TODO
     });
 
-    //Future<GetCommentTextResponse> getModerationCommentText(String commentId, { String tenantId, String sso }) async
+    //Future<GetCommentTextResponse> getModerationCommentText(String tenantId, String commentId, { String sso }) async
     test('test getModerationCommentText', () async {
       // TODO
     });
 
-    //Future<PreBanSummary> getPreBanSummary(String commentId, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String tenantId, String sso }) async
+    //Future<PreBanSummary> getPreBanSummary(String tenantId, String commentId, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String sso }) async
     test('test getPreBanSummary', () async {
       // TODO
     });
 
-    //Future<ModerationCommentSearchResponse> getSearchCommentsSummary({ String value, String filters, String searchFilters, String tenantId, String sso }) async
+    //Future<ModerationCommentSearchResponse> getSearchCommentsSummary(String tenantId, { String value, String filters, String searchFilters, String sso }) async
     test('test getSearchCommentsSummary', () async {
       // TODO
     });
 
-    //Future<ModerationPageSearchResponse> getSearchPages({ String value, String tenantId, String sso }) async
+    //Future<ModerationPageSearchResponse> getSearchPages(String tenantId, { String value, String sso }) async
     test('test getSearchPages', () async {
       // TODO
     });
 
-    //Future<ModerationSiteSearchResponse> getSearchSites({ String value, String tenantId, String sso }) async
+    //Future<ModerationSiteSearchResponse> getSearchSites(String tenantId, { String value, String sso }) async
     test('test getSearchSites', () async {
       // TODO
     });
 
-    //Future<ModerationSuggestResponse> getSearchSuggest({ String textSearch, String tenantId, String sso }) async
+    //Future<ModerationSuggestResponse> getSearchSuggest(String tenantId, { String textSearch, String sso }) async
     test('test getSearchSuggest', () async {
       // TODO
     });
 
-    //Future<ModerationUserSearchResponse> getSearchUsers({ String value, String tenantId, String sso }) async
+    //Future<ModerationUserSearchResponse> getSearchUsers(String tenantId, { String value, String sso }) async
     test('test getSearchUsers', () async {
       // TODO
     });
 
-    //Future<GetUserTrustFactorResponse> getTrustFactor({ String userId, String tenantId, String sso }) async
+    //Future<GetUserTrustFactorResponse> getTrustFactor(String tenantId, { String userId, String sso }) async
     test('test getTrustFactor', () async {
       // TODO
     });
 
-    //Future<APIModerateGetUserBanPreferencesResponse> getUserBanPreference({ String tenantId, String sso }) async
+    //Future<APIModerateGetUserBanPreferencesResponse> getUserBanPreference(String tenantId, { String sso }) async
     test('test getUserBanPreference', () async {
       // TODO
     });
 
-    //Future<GetUserInternalProfileResponse> getUserInternalProfile({ String commentId, String tenantId, String sso }) async
+    //Future<GetUserInternalProfileResponse> getUserInternalProfile(String tenantId, { String commentId, String sso }) async
     test('test getUserInternalProfile', () async {
       // TODO
     });
 
-    //Future<AdjustVotesResponse> postAdjustCommentVotes(String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String tenantId, String broadcastId, String sso }) async
+    //Future<AdjustVotesResponse> postAdjustCommentVotes(String tenantId, String commentId, AdjustCommentVotesParams adjustCommentVotesParams, { String broadcastId, String sso }) async
     test('test postAdjustCommentVotes', () async {
       // TODO
     });
 
-    //Future<ModerationExportResponse> postApiExport({ String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, String tenantId, String sso }) async
+    //Future<ModerationExportResponse> postApiExport(String tenantId, { String textSearch, String byIPFromComment, String filters, String searchFilters, String sorts, String sso }) async
     test('test postApiExport', () async {
       // TODO
     });
 
-    //Future<BanUserFromCommentResult> postBanUserFromComment(String commentId, { bool banEmail, bool banEmailDomain, bool banIP, bool deleteAllUsersComments, String bannedUntil, bool isShadowBan, String updateId, String banReason, String tenantId, String sso }) async
+    //Future<BanUserFromCommentResult> postBanUserFromComment(String tenantId, String commentId, { bool banEmail, bool banEmailDomain, bool banIP, bool deleteAllUsersComments, String bannedUntil, bool isShadowBan, String updateId, String banReason, String sso }) async
     test('test postBanUserFromComment', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postBanUserUndo(BanUserUndoParams banUserUndoParams, { String tenantId, String sso }) async
+    //Future<APIEmptyResponse> postBanUserUndo(String tenantId, BanUserUndoParams banUserUndoParams, { String sso }) async
     test('test postBanUserUndo', () async {
       // TODO
     });
 
-    //Future<BulkPreBanSummary> postBulkPreBanSummary(BulkPreBanParams bulkPreBanParams, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String tenantId, String sso }) async
+    //Future<BulkPreBanSummary> postBulkPreBanSummary(String tenantId, BulkPreBanParams bulkPreBanParams, { bool includeByUserIdAndEmail, bool includeByIP, bool includeByEmailDomain, String sso }) async
     test('test postBulkPreBanSummary', () async {
       // TODO
     });
 
-    //Future<ModerationAPIChildCommentsResponse> postCommentsByIds(CommentsByIdsParams commentsByIdsParams, { String tenantId, String sso }) async
+    //Future<ModerationAPIChildCommentsResponse> postCommentsByIds(String tenantId, CommentsByIdsParams commentsByIdsParams, { String sso }) async
     test('test postCommentsByIds', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postFlagComment(String commentId, { String tenantId, String broadcastId, String sso }) async
+    //Future<APIEmptyResponse> postFlagComment(String tenantId, String commentId, { String broadcastId, String sso }) async
     test('test postFlagComment', () async {
       // TODO
     });
 
-    //Future<PostRemoveCommentResponse> postRemoveComment(String commentId, { String tenantId, String broadcastId, String sso }) async
+    //Future<PostRemoveCommentApiResponse> postRemoveComment(String tenantId, String commentId, { String broadcastId, String sso }) async
     test('test postRemoveComment', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postRestoreDeletedComment(String commentId, { String tenantId, String broadcastId, String sso }) async
+    //Future<APIEmptyResponse> postRestoreDeletedComment(String tenantId, String commentId, { String broadcastId, String sso }) async
     test('test postRestoreDeletedComment', () async {
       // TODO
     });
 
-    //Future<SetCommentApprovedResponse> postSetCommentApprovalStatus(String commentId, { bool approved, String tenantId, String broadcastId, String sso }) async
+    //Future<SetCommentApprovedResponse> postSetCommentApprovalStatus(String tenantId, String commentId, { bool approved, String broadcastId, String sso }) async
     test('test postSetCommentApprovalStatus', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postSetCommentReviewStatus(String commentId, { bool reviewed, String tenantId, String broadcastId, String sso }) async
+    //Future<APIEmptyResponse> postSetCommentReviewStatus(String tenantId, String commentId, { bool reviewed, String broadcastId, String sso }) async
     test('test postSetCommentReviewStatus', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postSetCommentSpamStatus(String commentId, { bool spam, bool permNotSpam, String tenantId, String broadcastId, String sso }) async
+    //Future<APIEmptyResponse> postSetCommentSpamStatus(String tenantId, String commentId, { bool spam, bool permNotSpam, String broadcastId, String sso }) async
     test('test postSetCommentSpamStatus', () async {
       // TODO
     });
 
-    //Future<SetCommentTextResponse> postSetCommentText(String commentId, SetCommentTextParams setCommentTextParams, { String tenantId, String broadcastId, String sso }) async
+    //Future<SetCommentTextResponse> postSetCommentText(String tenantId, String commentId, SetCommentTextParams setCommentTextParams, { String broadcastId, String sso }) async
     test('test postSetCommentText', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> postUnFlagComment(String commentId, { String tenantId, String broadcastId, String sso }) async
+    //Future<APIEmptyResponse> postUnFlagComment(String tenantId, String commentId, { String broadcastId, String sso }) async
     test('test postUnFlagComment', () async {
       // TODO
     });
 
-    //Future<VoteResponse> postVote(String commentId, { String direction, String tenantId, String broadcastId, String sso }) async
+    //Future<VoteResponse> postVote(String tenantId, String commentId, { String direction, String broadcastId, String sso }) async
     test('test postVote', () async {
       // TODO
     });
 
-    //Future<AwardUserBadgeResponse> putAwardBadge(String badgeId, { String userId, String commentId, String tenantId, String broadcastId, String sso }) async
+    //Future<AwardUserBadgeResponse> putAwardBadge(String tenantId, String badgeId, { String userId, String commentId, String broadcastId, String sso }) async
     test('test putAwardBadge', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> putCloseThread(String urlId, { String tenantId, String sso }) async
+    //Future<APIEmptyResponse> putCloseThread(String tenantId, String urlId, { String sso }) async
     test('test putCloseThread', () async {
       // TODO
     });
 
-    //Future<RemoveUserBadgeResponse> putRemoveBadge(String badgeId, { String userId, String commentId, String tenantId, String broadcastId, String sso }) async
+    //Future<RemoveUserBadgeResponse> putRemoveBadge(String tenantId, String badgeId, { String userId, String commentId, String broadcastId, String sso }) async
     test('test putRemoveBadge', () async {
       // TODO
     });
 
-    //Future<APIEmptyResponse> putReopenThread(String urlId, { String tenantId, String sso }) async
+    //Future<APIEmptyResponse> putReopenThread(String tenantId, String urlId, { String sso }) async
     test('test putReopenThread', () async {
       // TODO
     });
 
-    //Future<SetUserTrustFactorResponse> setTrustFactor({ String userId, String trustFactor, String tenantId, String sso }) async
+    //Future<SetUserTrustFactorResponse> setTrustFactor(String tenantId, { String userId, String trustFactor, String sso }) async
     test('test setTrustFactor', () async {
       // TODO
     });
diff --git a/client/test/post_remove_comment_response_test.dart b/client/test/post_remove_comment_api_response_test.dart
similarity index 79%
rename from client/test/post_remove_comment_response_test.dart
rename to client/test/post_remove_comment_api_response_test.dart
index fa9700f..6dcf648 100644
--- a/client/test/post_remove_comment_response_test.dart
+++ b/client/test/post_remove_comment_api_response_test.dart
@@ -11,11 +11,11 @@
 import 'package:fastcomments_dart/api.dart';
 import 'package:test/test.dart';
 
-// tests for PostRemoveCommentResponse
+// tests for PostRemoveCommentApiResponse
 void main() {
-  // final instance = PostRemoveCommentResponse();
+  // final instance = PostRemoveCommentApiResponse();
 
-  group('test PostRemoveCommentResponse', () {
+  group('test PostRemoveCommentApiResponse', () {
     // String action
     test('to test the property `action`', () async {
       // TODO
diff --git a/openapi.json b/openapi.json
index 9ed89a9..302747d 100644
--- a/openapi.json
+++ b/openapi.json
@@ -13107,9 +13107,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/count": {
+		"/auth/my-account/moderate-comments/mod_api/count": {
 			"get": {
-				"operationId": "GetCount",
+				"operationId": "getCount",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13137,6 +13137,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "text-search",
@@ -13177,14 +13185,6 @@
 							"type": "boolean"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13196,9 +13196,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/api/ids": {
+		"/auth/my-account/moderate-comments/mod_api/api/ids": {
 			"get": {
-				"operationId": "GetApiIds",
+				"operationId": "getApiIds",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13226,6 +13226,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "text-search",
@@ -13274,14 +13282,6 @@
 							"type": "boolean"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13293,9 +13293,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/api/comments": {
+		"/auth/my-account/moderate-comments/mod_api/api/comments": {
 			"get": {
-				"operationId": "GetApiComments",
+				"operationId": "getApiComments",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13323,6 +13323,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "query",
 						"name": "page",
@@ -13389,14 +13397,6 @@
 							"type": "boolean"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13408,9 +13408,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/api/export": {
+		"/auth/my-account/moderate-comments/mod_api/api/export": {
 			"post": {
-				"operationId": "PostApiExport",
+				"operationId": "postApiExport",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13440,15 +13440,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "text-search",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "byIPFromComment",
+						"name": "text-search",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13456,7 +13456,7 @@
 					},
 					{
 						"in": "query",
-						"name": "filters",
+						"name": "byIPFromComment",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13464,7 +13464,7 @@
 					},
 					{
 						"in": "query",
-						"name": "searchFilters",
+						"name": "filters",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13472,7 +13472,7 @@
 					},
 					{
 						"in": "query",
-						"name": "sorts",
+						"name": "searchFilters",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13480,7 +13480,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "sorts",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13497,9 +13497,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/api/export/status": {
+		"/auth/my-account/moderate-comments/mod_api/api/export/status": {
 			"get": {
-				"operationId": "GetApiExportStatus",
+				"operationId": "getApiExportStatus",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13529,15 +13529,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "batchJobId",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "batchJobId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13554,9 +13554,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/search/users": {
+		"/auth/my-account/moderate-comments/mod_api/search/users": {
 			"get": {
-				"operationId": "GetSearchUsers",
+				"operationId": "getSearchUsers",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13586,15 +13586,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "value",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "value",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13611,9 +13611,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/search/pages": {
+		"/auth/my-account/moderate-comments/mod_api/search/pages": {
 			"get": {
-				"operationId": "GetSearchPages",
+				"operationId": "getSearchPages",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13643,15 +13643,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "value",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "value",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13668,9 +13668,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/search/sites": {
+		"/auth/my-account/moderate-comments/mod_api/search/sites": {
 			"get": {
-				"operationId": "GetSearchSites",
+				"operationId": "getSearchSites",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13700,15 +13700,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "value",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "value",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13725,9 +13725,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/search/comments/summary": {
+		"/auth/my-account/moderate-comments/mod_api/search/comments/summary": {
 			"get": {
-				"operationId": "GetSearchCommentsSummary",
+				"operationId": "getSearchCommentsSummary",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13757,15 +13757,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "value",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "filters",
+						"name": "value",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13773,7 +13773,7 @@
 					},
 					{
 						"in": "query",
-						"name": "searchFilters",
+						"name": "filters",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13781,7 +13781,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "searchFilters",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13798,9 +13798,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/search/suggest": {
+		"/auth/my-account/moderate-comments/mod_api/search/suggest": {
 			"get": {
-				"operationId": "GetSearchSuggest",
+				"operationId": "getSearchSuggest",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13830,15 +13830,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "text-search",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "text-search",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -13855,9 +13855,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/pre-ban-summary/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId}": {
 			"get": {
-				"operationId": "GetPreBanSummary",
+				"operationId": "getPreBanSummary",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13885,6 +13885,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "path",
 						"name": "commentId",
@@ -13917,14 +13925,6 @@
 							"type": "boolean"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -13936,9 +13936,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/bulk-pre-ban-summary": {
+		"/auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary": {
 			"post": {
-				"operationId": "PostBulkPreBanSummary",
+				"operationId": "postBulkPreBanSummary",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -13968,15 +13968,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "includeByUserIdAndEmail",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
-							"type": "boolean"
+							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "includeByIP",
+						"name": "includeByUserIdAndEmail",
 						"required": false,
 						"schema": {
 							"type": "boolean"
@@ -13984,7 +13984,7 @@
 					},
 					{
 						"in": "query",
-						"name": "includeByEmailDomain",
+						"name": "includeByIP",
 						"required": false,
 						"schema": {
 							"type": "boolean"
@@ -13992,10 +13992,10 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "includeByEmailDomain",
 						"required": false,
 						"schema": {
-							"type": "string"
+							"type": "boolean"
 						}
 					},
 					{
@@ -14019,9 +14019,9 @@
 				}
 			}
 		},
-		"/auth/my-account/moderate-comments/ban-user/from-comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId}": {
 			"post": {
-				"operationId": "PostBanUserFromComment",
+				"operationId": "postBanUserFromComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14049,6 +14049,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "path",
 						"name": "commentId",
@@ -14121,14 +14129,6 @@
 							"type": "string"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14140,9 +14140,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/ban-users/from-comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId}": {
 			"get": {
-				"operationId": "GetBanUsersFromComment",
+				"operationId": "getBanUsersFromComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14171,17 +14171,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14197,9 +14197,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/ban-user/undo": {
+		"/auth/my-account/moderate-comments/mod_api/ban-user/undo": {
 			"post": {
-				"operationId": "PostBanUserUndo",
+				"operationId": "postBanUserUndo",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14230,7 +14230,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14256,16 +14256,16 @@
 				}
 			}
 		},
-		"/auth/my-account/moderate-comments/remove-comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/remove-comment/{commentId}": {
 			"post": {
-				"operationId": "PostRemoveComment",
+				"operationId": "postRemoveComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
 						"content": {
 							"application/json": {
 								"schema": {
-									"title": "PostRemoveCommentResponse",
+									"title": "PostRemoveCommentApiResponse",
 									"anyOf": [
 										{
 											"$ref": "#/components/schemas/DeleteCommentResult"
@@ -14295,17 +14295,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14329,9 +14329,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/restore-deleted-comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId}": {
 			"post": {
-				"operationId": "PostRestoreDeletedComment",
+				"operationId": "postRestoreDeletedComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14360,17 +14360,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14394,9 +14394,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/flag-comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/flag-comment/{commentId}": {
 			"post": {
-				"operationId": "PostFlagComment",
+				"operationId": "postFlagComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14425,17 +14425,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14459,9 +14459,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/un-flag-comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId}": {
 			"post": {
-				"operationId": "PostUnFlagComment",
+				"operationId": "postUnFlagComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14490,17 +14490,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14524,9 +14524,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/set-comment-review-status/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId}": {
 			"post": {
-				"operationId": "PostSetCommentReviewStatus",
+				"operationId": "postSetCommentReviewStatus",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14555,27 +14555,27 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "reviewed",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
-							"type": "boolean"
+							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "reviewed",
 						"required": false,
 						"schema": {
-							"type": "string"
+							"type": "boolean"
 						}
 					},
 					{
@@ -14597,9 +14597,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/set-comment-spam-status/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId}": {
 			"post": {
-				"operationId": "PostSetCommentSpamStatus",
+				"operationId": "postSetCommentSpamStatus",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14627,6 +14627,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "path",
 						"name": "commentId",
@@ -14651,14 +14659,6 @@
 							"type": "boolean"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "broadcastId",
@@ -14678,9 +14678,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/set-comment-approval-status/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId}": {
 			"post": {
-				"operationId": "PostSetCommentApprovalStatus",
+				"operationId": "postSetCommentApprovalStatus",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14709,27 +14709,27 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "approved",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
-							"type": "boolean"
+							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "approved",
 						"required": false,
 						"schema": {
-							"type": "string"
+							"type": "boolean"
 						}
 					},
 					{
@@ -14751,9 +14751,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/logs/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/logs/{commentId}": {
 			"get": {
-				"operationId": "GetLogs",
+				"operationId": "getLogs",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14782,17 +14782,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14808,9 +14808,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/comment/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/comment/{commentId}": {
 			"get": {
-				"operationId": "GetModerationComment",
+				"operationId": "getModerationComment",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14838,6 +14838,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "path",
 						"name": "commentId",
@@ -14862,14 +14870,6 @@
 							"type": "boolean"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -14881,9 +14881,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/comments-by-ids": {
+		"/auth/my-account/moderate-comments/mod_api/comments-by-ids": {
 			"post": {
-				"operationId": "PostCommentsByIds",
+				"operationId": "postCommentsByIds",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14914,7 +14914,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14940,9 +14940,9 @@
 				}
 			}
 		},
-		"/auth/my-account/moderate-comments/comment-children/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/comment-children/{commentId}": {
 			"get": {
-				"operationId": "GetCommentChildren",
+				"operationId": "getCommentChildren",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -14971,17 +14971,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -14997,9 +14997,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/get-comment-text/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId}": {
 			"get": {
-				"operationId": "GetModerationCommentText",
+				"operationId": "getModerationCommentText",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15028,17 +15028,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15054,9 +15054,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/set-comment-text/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId}": {
 			"post": {
-				"operationId": "PostSetCommentText",
+				"operationId": "postSetCommentText",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15085,17 +15085,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15129,9 +15129,9 @@
 				}
 			}
 		},
-		"/auth/my-account/moderate-comments/adjust-comment-votes/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId}": {
 			"post": {
-				"operationId": "PostAdjustCommentVotes",
+				"operationId": "postAdjustCommentVotes",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15160,17 +15160,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15204,9 +15204,9 @@
 				}
 			}
 		},
-		"/auth/my-account/moderate-comments/vote/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/vote/{commentId}": {
 			"post": {
-				"operationId": "PostVote",
+				"operationId": "postVote",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15235,24 +15235,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "direction",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "direction",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15277,9 +15277,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/vote/{commentId}/{voteId}": {
+		"/auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId}": {
 			"delete": {
-				"operationId": "DeleteModerationVote",
+				"operationId": "deleteModerationVote",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15308,8 +15308,8 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
@@ -15317,16 +15317,16 @@
 					},
 					{
 						"in": "path",
-						"name": "voteId",
+						"name": "commentId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "voteId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15350,9 +15350,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/get-comment-ban-status/{commentId}": {
+		"/auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId}": {
 			"get": {
-				"operationId": "GetCommentBanStatus",
+				"operationId": "getCommentBanStatus",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15381,17 +15381,17 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15407,9 +15407,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/user-ban-preference": {
+		"/auth/my-account/moderate-comments/mod_api/user-ban-preference": {
 			"get": {
-				"operationId": "GetUserBanPreference",
+				"operationId": "getUserBanPreference",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15440,7 +15440,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15456,9 +15456,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/get-manual-badges": {
+		"/auth/my-account/moderate-comments/mod_api/get-manual-badges": {
 			"get": {
-				"operationId": "GetManualBadges",
+				"operationId": "getManualBadges",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15489,7 +15489,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15505,9 +15505,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/get-manual-badges-for-user": {
+		"/auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user": {
 			"get": {
-				"operationId": "GetManualBadgesForUser",
+				"operationId": "getManualBadgesForUser",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15537,15 +15537,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "badgesUserId",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "commentId",
+						"name": "badgesUserId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15553,7 +15553,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "commentId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15570,9 +15570,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/award-badge": {
+		"/auth/my-account/moderate-comments/mod_api/award-badge": {
 			"put": {
-				"operationId": "PutAwardBadge",
+				"operationId": "putAwardBadge",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15602,7 +15602,7 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "badgeId",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
@@ -15610,15 +15610,15 @@
 					},
 					{
 						"in": "query",
-						"name": "userId",
-						"required": false,
+						"name": "badgeId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "commentId",
+						"name": "userId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15626,7 +15626,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "commentId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15651,9 +15651,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/remove-badge": {
+		"/auth/my-account/moderate-comments/mod_api/remove-badge": {
 			"put": {
-				"operationId": "PutRemoveBadge",
+				"operationId": "putRemoveBadge",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15683,7 +15683,7 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "badgeId",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
@@ -15691,15 +15691,15 @@
 					},
 					{
 						"in": "query",
-						"name": "userId",
-						"required": false,
+						"name": "badgeId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "commentId",
+						"name": "userId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15707,7 +15707,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "commentId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15732,9 +15732,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/get-trust-factor": {
+		"/auth/my-account/moderate-comments/mod_api/get-trust-factor": {
 			"get": {
-				"operationId": "GetTrustFactor",
+				"operationId": "getTrustFactor",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15764,15 +15764,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "userId",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "userId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15789,9 +15789,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/set-trust-factor": {
+		"/auth/my-account/moderate-comments/mod_api/set-trust-factor": {
 			"put": {
-				"operationId": "SetTrustFactor",
+				"operationId": "setTrustFactor",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15821,15 +15821,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "userId",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "trustFactor",
+						"name": "userId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15837,7 +15837,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "trustFactor",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15854,9 +15854,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/get-user-internal-profile": {
+		"/auth/my-account/moderate-comments/mod_api/get-user-internal-profile": {
 			"get": {
-				"operationId": "GetUserInternalProfile",
+				"operationId": "getUserInternalProfile",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15886,15 +15886,15 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "commentId",
-						"required": false,
+						"name": "tenantId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "commentId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15911,9 +15911,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/reopen-thread": {
+		"/auth/my-account/moderate-comments/mod_api/reopen-thread": {
 			"put": {
-				"operationId": "PutReopenThread",
+				"operationId": "putReopenThread",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -15943,7 +15943,7 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "urlId",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
@@ -15951,8 +15951,8 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"name": "urlId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -15968,9 +15968,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/close-thread": {
+		"/auth/my-account/moderate-comments/mod_api/close-thread": {
 			"put": {
-				"operationId": "PutCloseThread",
+				"operationId": "putCloseThread",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -16000,7 +16000,7 @@
 				"parameters": [
 					{
 						"in": "query",
-						"name": "urlId",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
@@ -16008,8 +16008,8 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"name": "urlId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -16025,9 +16025,9 @@
 				]
 			}
 		},
-		"/auth/my-account/moderate-comments/banned-users/counts": {
+		"/auth/my-account/moderate-comments/banned-users/mod_api/counts": {
 			"get": {
-				"operationId": "GetCounts",
+				"operationId": "getCounts",
 				"responses": {
 					"200": {
 						"description": "Ok",
@@ -16058,7 +16058,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -23027,7 +23027,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -23079,7 +23079,7 @@
 					{
 						"in": "query",
 						"name": "tenantId",
-						"required": false,
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -23129,17 +23129,17 @@
 				],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "tag",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "tag",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
@@ -23187,17 +23187,17 @@
 				],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "tag",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
+						"in": "path",
+						"name": "tag",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
diff --git a/sso_tests/test/sso_integration_test.dart b/sso_tests/test/sso_integration_test.dart
index 74cd07a..40a7f00 100644
--- a/sso_tests/test/sso_integration_test.dart
+++ b/sso_tests/test/sso_integration_test.dart
@@ -43,7 +43,7 @@ void main() {
       urlId,
       'dart-test-$timestamp',
       commentData,
-      ApiCreateCommentPublicOptions(sso: token),
+      CreateCommentPublicOptions(sso: token),
     );
     expect(createResponse, isNotNull);
     expect(createResponse!.status, APIStatus.success);
@@ -53,7 +53,7 @@ void main() {
     final getResponse = await api.getCommentsPublic(
       tenantId,
       urlId,
-      ApiGetCommentsPublicOptions(sso: token),
+      GetCommentsPublicOptions(sso: token),
     );
     expect(getResponse, isNotNull);
     expect(getResponse!.status, 'success');

From 06e07f43baf468ff9c14d90ea71b7ba6ae5d994c Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Tue, 30 Jun 2026 10:39:44 -0700
Subject: [PATCH 8/9] README: shorten the ModerationApi description

Replace the long capability enumeration with a concise summary.
---
 README.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 864b56c..6a816a1 100644
--- a/README.md
+++ b/README.md
@@ -41,17 +41,10 @@ SSO helpers are included in the package (`package:fastcomments_dart/sso/...`).
 
 The client exposes three API classes:
 
-- `DefaultApi` — API-key-authenticated methods for server-side use.
-- `PublicApi` — public methods that need no API key, safe for browser and
+- `DefaultApi` - API-key-authenticated methods for server-side use.
+- `PublicApi` - public methods that need no API key, safe for browser and
   mobile clients.
-- `ModerationApi` — methods that back the moderator dashboard: comment
-  moderation (list, count, search, logs, export), moderation actions
-  (remove/restore, flag, set review/spam/approval status, votes, reopen/close
-  thread), bans (ban from comment, undo, pre-ban summaries, ban status and
-  preferences, banned-user counts), and badges & trust (award/remove badge,
-  manual badges, get/set trust factor, user internal profile). Every
-  `ModerationApi` method takes an `sso` parameter for SSO-authenticated
-  moderators.
+- `ModerationApi` - an extensive suite of live and fast moderation APIs. Every `ModerationApi` method takes an `sso` parameter and can authenticate via SSO or a FastComments.com session cookie.
 
 ```dart
 import 'package:fastcomments_dart/api.dart';

From 5571505ff44e9260ae993daa7ab138234d3eac62 Mon Sep 17 00:00:00 2001
From: winrid <winrid@gmail.com>
Date: Tue, 30 Jun 2026 12:10:27 -0700
Subject: [PATCH 9/9] Release v3.0.0: regenerate at 3.0.0 with
 fastcomments-build-20260630 jar

Bump version to 3.0.0 and regenerate from the new generator fork release.
---
 client/pubspec.yaml | 2 +-
 config.json         | 4 ++--
 update.py           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/pubspec.yaml b/client/pubspec.yaml
index 4692ae3..980b266 100644
--- a/client/pubspec.yaml
+++ b/client/pubspec.yaml
@@ -3,7 +3,7 @@
 #
 
 name: 'fastcomments_dart'
-version: '2.1.0'
+version: '3.0.0'
 description: 'Official Dart client for the FastComments REST API.'
 homepage: 'https://fastcomments.com'
 repository: https://github.com/fastcomments/fastcomments-dart
diff --git a/config.json b/config.json
index b26052e..4f0a61f 100644
--- a/config.json
+++ b/config.json
@@ -2,11 +2,11 @@
   "pubName": "fastcomments_dart",
   "pubAuthor": "FastComments",
   "pubAuthorEmail": "support@fastcomments.com",
-  "pubVersion": "2.1.0",
+  "pubVersion": "3.0.0",
   "pubDescription": "Official Dart client for the FastComments REST API.",
   "pubHomepage": "https://fastcomments.com",
   "pubRepository": "https://github.com/fastcomments/fastcomments-dart",
   "hideGenerationTimestamp": true,
   "useEnumExtension": true,
   "useSingleRequestParameter": true
-}
+}
\ No newline at end of file
diff --git a/update.py b/update.py
index 104a427..52b5e17 100755
--- a/update.py
+++ b/update.py
@@ -21,7 +21,7 @@
 
 # FastComments openapi-generator build (fixes dart anyOf/nested-map codegen the
 # released generator gets wrong). Just a jar; downloaded on demand.
-JAR_URL = "https://github.com/winrid/openapi-generator/releases/download/fastcomments-build-20260619/openapi-generator-cli.jar"
+JAR_URL = "https://github.com/winrid/openapi-generator/releases/download/fastcomments-build-20260630/openapi-generator-cli.jar"
 JAR_FILE = ROOT / "openapi-generator-cli.jar"