diff --git a/README.md b/README.md
index 8f35833..6acefd0 100644
--- a/README.md
+++ b/README.md
@@ -42,10 +42,7 @@ This library contains the generated API client and the SSO utilities to make wor
 ### Public vs Secured APIs
 
 For the API client, there are three classes, `DefaultApi`, `PublicApi`, and `ModerationApi`. The `DefaultApi` contains methods that require your API key, and `PublicApi` contains
-methods that can be made directly from a browser/mobile device/etc without authentication. The `ModerationApi` contains methods that power the moderator dashboard - listing,
-counting, searching, exporting and pulling logs for comments, moderation actions (remove/restore, flag, set review/spam/approval status, adjust votes, reopen/close threads),
-bans (ban from a comment, undo bans, pre-ban summaries, ban status and preferences, banned-user counts), and badges & trust (award/remove badges, manual badges, get/set trust
-factor, user internal profile). Every `ModerationApi` method accepts an `sso` parameter so the call is performed on behalf of an SSO-authenticated moderator.
+methods that can be made directly from a browser/mobile device/etc without authentication. The `ModerationApi` provides an extensive suite of live and fast moderation APIs. Every `ModerationApi` method accepts an `sso` parameter and can authenticate via SSO or a FastComments.com session cookie.
 
 ## Quick Start
 
@@ -126,14 +123,10 @@ int main() {
     // Pass the moderator's SSO token to authenticate the call
     auto ssoToken = utility::conversions::to_string_t("YOUR_MODERATOR_SSO_TOKEN");
 
-    auto response = moderationApi.getCount(
-        boost::none,  // textSearch
-        boost::none,  // byIPFromComment
-        boost::none,  // filter
-        boost::none,  // searchFilters
-        boost::none,  // demo
-        ssoToken      // sso
-    ).get();
+    org::openapitools::client::api::GetCountOptions options;
+    options.sso = ssoToken;
+
+    auto response = moderationApi.getCount(options).get();
 
     return 0;
 }
@@ -162,23 +155,14 @@ config->setApiKey(utility::conversions::to_string_t("api_key"),
 auto apiClient = std::make_shared<org::openapitools::client::api::ApiClient>(config);
 org::openapitools::client::api::DefaultApi api(apiClient);
 
+// Required parameters are positional; optional ones go in the options struct
+org::openapitools::client::api::GetCommentsOptions options;
+options.urlId = utility::conversions::to_string_t("your-url-id");
+
 // Call .get() to block and get the result synchronously
 auto response = api.getComments(
     utility::conversions::to_string_t("your-tenant-id"),
-    boost::none,  // page
-    boost::none,  // limit
-    boost::none,  // skip
-    boost::none,  // asTree
-    boost::none,  // skipChildren
-    boost::none,  // limitChildren
-    boost::none,  // maxTreeDepth
-    utility::conversions::to_string_t("your-url-id"),  // urlId
-    boost::none,  // userId
-    boost::none,  // anonUserId
-    boost::none,  // contextUserId
-    boost::none,  // hashTag
-    boost::none,  // parentId
-    boost::none   // direction
+    options
 ).get();  // Blocks until the HTTP request completes
 
 if (response && response->comments) {
@@ -199,13 +183,14 @@ config->setApiKey(utility::conversions::to_string_t("api_key"),
 auto apiClient = std::make_shared<org::openapitools::client::api::ApiClient>(config);
 org::openapitools::client::api::DefaultApi api(apiClient);
 
+// Required parameters are positional; optional ones go in the options struct
+org::openapitools::client::api::GetCommentsOptions options;
+options.urlId = utility::conversions::to_string_t("your-url-id");
+
 // Use .then() for asynchronous callback-based execution
 api.getComments(
     utility::conversions::to_string_t("your-tenant-id"),
-    boost::none, boost::none, boost::none, boost::none, boost::none,
-    boost::none, boost::none,
-    utility::conversions::to_string_t("your-url-id"),
-    boost::none, boost::none, boost::none, boost::none, boost::none, boost::none
+    options
 ).then([](std::shared_ptr<GetComments_200_response> response) {
     // This runs asynchronously when the request completes
     if (response && response->comments) {
diff --git a/client/README.md b/client/README.md
index 126c2f7..d98663b 100644
--- a/client/README.md
+++ b/client/README.md
@@ -6,7 +6,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI spec](https://openapis.org) from a remote server, you can easily generate an API client.
 
 - API version: 0.0.0
-- Package version: 2.0.1
+- Package version: 3.0.0
 - Generator version: 7.23.0-SNAPSHOT
 - Build package: org.openapitools.codegen.languages.CppRestSdkClientCodegen
 
diff --git a/client/include/FastCommentsClient/api/DefaultApi.h b/client/include/FastCommentsClient/api/DefaultApi.h
index a2d41a8..375840c 100644
--- a/client/include/FastCommentsClient/api/DefaultApi.h
+++ b/client/include/FastCommentsClient/api/DefaultApi.h
@@ -167,6 +167,216 @@ namespace api {
 
 using namespace org::openapitools::client::model;
 
+struct AggregateOptions
+{
+    boost::optional<utility::string_t> parentTenantId;
+    boost::optional<bool> includeStats;
+};
+struct AggregateQuestionResultsOptions
+{
+    boost::optional<utility::string_t> questionId;
+    boost::optional<std::vector<utility::string_t>> questionIds;
+    boost::optional<utility::string_t> urlId;
+    boost::optional<std::shared_ptr<AggregateTimeBucket>> timeBucket;
+    boost::optional<utility::datetime> startDate;
+    boost::optional<bool> forceRecalculate;
+};
+struct BlockUserFromCommentOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+};
+struct CombineCommentsWithQuestionResultsOptions
+{
+    boost::optional<utility::string_t> questionId;
+    boost::optional<std::vector<utility::string_t>> questionIds;
+    boost::optional<utility::string_t> urlId;
+    boost::optional<utility::datetime> startDate;
+    boost::optional<bool> forceRecalculate;
+    boost::optional<double> minValue;
+    boost::optional<double> maxValue;
+    boost::optional<double> limit;
+};
+struct CreateFeedPostOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<bool> isLive;
+    boost::optional<bool> doSpamCheck;
+    boost::optional<bool> skipDupCheck;
+};
+struct CreateVoteOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+};
+struct DeleteCommentOptions
+{
+    boost::optional<utility::string_t> contextUserId;
+    boost::optional<bool> isLive;
+};
+struct DeleteSSOUserOptions
+{
+    boost::optional<bool> deleteComments;
+    boost::optional<utility::string_t> commentDeleteMode;
+};
+struct DeleteTenantUserOptions
+{
+    boost::optional<utility::string_t> deleteComments;
+    boost::optional<utility::string_t> commentDeleteMode;
+};
+struct FlagCommentOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+};
+struct GetAuditLogsOptions
+{
+    boost::optional<double> limit;
+    boost::optional<double> skip;
+    boost::optional<std::shared_ptr<SORT_DIR>> order;
+    boost::optional<double> after;
+    boost::optional<double> before;
+};
+struct GetCommentsOptions
+{
+    boost::optional<int32_t> page;
+    boost::optional<int32_t> limit;
+    boost::optional<int32_t> skip;
+    boost::optional<bool> asTree;
+    boost::optional<int32_t> skipChildren;
+    boost::optional<int32_t> limitChildren;
+    boost::optional<int32_t> maxTreeDepth;
+    boost::optional<utility::string_t> urlId;
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+    boost::optional<utility::string_t> contextUserId;
+    boost::optional<utility::string_t> hashTag;
+    boost::optional<utility::string_t> parentId;
+    boost::optional<std::shared_ptr<SortDirections>> direction;
+    boost::optional<int64_t> fromDate;
+    boost::optional<int64_t> toDate;
+};
+struct GetFeedPostsOptions
+{
+    boost::optional<utility::string_t> afterId;
+    boost::optional<int32_t> limit;
+    boost::optional<std::vector<utility::string_t>> tags;
+};
+struct GetNotificationCountOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> urlId;
+    boost::optional<utility::string_t> fromCommentId;
+    boost::optional<bool> viewed;
+    boost::optional<utility::string_t> type;
+};
+struct GetNotificationsOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> urlId;
+    boost::optional<utility::string_t> fromCommentId;
+    boost::optional<bool> viewed;
+    boost::optional<utility::string_t> type;
+    boost::optional<double> skip;
+};
+struct GetPendingWebhookEventCountOptions
+{
+    boost::optional<utility::string_t> commentId;
+    boost::optional<utility::string_t> externalId;
+    boost::optional<utility::string_t> eventType;
+    boost::optional<utility::string_t> type;
+    boost::optional<utility::string_t> domain;
+    boost::optional<double> attemptCountGT;
+};
+struct GetPendingWebhookEventsOptions
+{
+    boost::optional<utility::string_t> commentId;
+    boost::optional<utility::string_t> externalId;
+    boost::optional<utility::string_t> eventType;
+    boost::optional<utility::string_t> type;
+    boost::optional<utility::string_t> domain;
+    boost::optional<double> attemptCountGT;
+    boost::optional<double> skip;
+};
+struct GetQuestionResultsOptions
+{
+    boost::optional<utility::string_t> urlId;
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> startDate;
+    boost::optional<utility::string_t> questionId;
+    boost::optional<utility::string_t> questionIds;
+    boost::optional<double> skip;
+};
+struct GetTenantDailyUsagesOptions
+{
+    boost::optional<double> yearNumber;
+    boost::optional<double> monthNumber;
+    boost::optional<double> dayNumber;
+    boost::optional<double> skip;
+};
+struct GetTenantsOptions
+{
+    boost::optional<utility::string_t> meta;
+    boost::optional<double> skip;
+};
+struct GetTicketsOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<double> state;
+    boost::optional<double> skip;
+    boost::optional<double> limit;
+};
+struct GetUserBadgeProgressListOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<double> limit;
+    boost::optional<double> skip;
+};
+struct GetUserBadgesOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> badgeId;
+    boost::optional<double> type;
+    boost::optional<bool> displayedOnComments;
+    boost::optional<double> limit;
+    boost::optional<double> skip;
+};
+struct GetVotesForUserOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+};
+struct SaveCommentOptions
+{
+    boost::optional<bool> isLive;
+    boost::optional<bool> doSpamCheck;
+    boost::optional<bool> sendEmails;
+    boost::optional<bool> populateNotifications;
+};
+struct SaveCommentsBulkOptions
+{
+    boost::optional<bool> isLive;
+    boost::optional<bool> doSpamCheck;
+    boost::optional<bool> sendEmails;
+    boost::optional<bool> populateNotifications;
+};
+struct UnBlockUserFromCommentOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+};
+struct UnFlagCommentOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> anonUserId;
+};
+struct UpdateCommentOptions
+{
+    boost::optional<utility::string_t> contextUserId;
+    boost::optional<bool> doSpamCheck;
+    boost::optional<bool> isLive;
+};
+
 
 
 class  DefaultApi 
@@ -188,6 +398,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<AddDomainConfigResponse>> addDomainConfig(
         utility::string_t tenantId,
         std::shared_ptr<AddDomainConfigParams> addDomainConfigParams
+        
     ) const;
     /// <summary>
     /// 
@@ -195,11 +406,12 @@ class  DefaultApi
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
+    /// <param name="tenantId"></param>
     /// <param name="createHashTagBody"> (optional)</param>
     pplx::task<std::shared_ptr<CreateHashTagResponse>> addHashTag(
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<std::shared_ptr<CreateHashTagBody>> createHashTagBody
+        utility::string_t tenantId,
+        std::shared_ptr<CreateHashTagBody> createHashTagBody
+        
     ) const;
     /// <summary>
     /// 
@@ -207,11 +419,12 @@ class  DefaultApi
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
+    /// <param name="tenantId"></param>
     /// <param name="bulkCreateHashTagsBody"> (optional)</param>
     pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> addHashTagsBulk(
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<std::shared_ptr<BulkCreateHashTagsBody>> bulkCreateHashTagsBody
+        utility::string_t tenantId,
+        std::shared_ptr<BulkCreateHashTagsBody> bulkCreateHashTagsBody
+        
     ) const;
     /// <summary>
     /// 
@@ -224,6 +437,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<AddPageAPIResponse>> addPage(
         utility::string_t tenantId,
         std::shared_ptr<CreateAPIPageData> createAPIPageData
+        
     ) const;
     /// <summary>
     /// 
@@ -236,6 +450,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<AddSSOUserAPIResponse>> addSSOUser(
         utility::string_t tenantId,
         std::shared_ptr<CreateAPISSOUserData> createAPISSOUserData
+        
     ) const;
     /// <summary>
     /// 
@@ -249,9 +464,9 @@ class  DefaultApi
     /// <param name="includeStats"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<AggregateResponse>> aggregate(
         utility::string_t tenantId,
-        std::shared_ptr<AggregationRequest> aggregationRequest,
-        boost::optional<utility::string_t> parentTenantId,
-        boost::optional<bool> includeStats
+        std::shared_ptr<AggregationRequest> aggregationRequest
+        
+        , const AggregateOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -267,13 +482,9 @@ class  DefaultApi
     /// <param name="startDate"> (optional, default to utility::datetime())</param>
     /// <param name="forceRecalculate"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<AggregateQuestionResultsResponse>> aggregateQuestionResults(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> questionId,
-        boost::optional<std::vector<utility::string_t>> questionIds,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<std::shared_ptr<AggregateTimeBucket>> timeBucket,
-        boost::optional<utility::datetime> startDate,
-        boost::optional<bool> forceRecalculate
+        utility::string_t tenantId
+        
+        , const AggregateQuestionResultsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -289,9 +500,9 @@ class  DefaultApi
     pplx::task<std::shared_ptr<BlockSuccess>> blockUserFromComment(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<BlockFromCommentParams> blockFromCommentParams,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId
+        std::shared_ptr<BlockFromCommentParams> blockFromCommentParams
+        
+        , const BlockUserFromCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -304,8 +515,8 @@ class  DefaultApi
     /// <param name="forceRecalculate"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<BulkAggregateQuestionResultsResponse>> bulkAggregateQuestionResults(
         utility::string_t tenantId,
-        std::shared_ptr<BulkAggregateQuestionResultsRequest> bulkAggregateQuestionResultsRequest,
-        boost::optional<bool> forceRecalculate
+        std::shared_ptr<BulkAggregateQuestionResultsRequest> bulkAggregateQuestionResultsRequest
+        , boost::optional<bool> forceRecalculate = boost::none
     ) const;
     /// <summary>
     /// 
@@ -322,6 +533,7 @@ class  DefaultApi
         utility::string_t userId,
         utility::string_t id,
         std::shared_ptr<ChangeTicketStateBody> changeTicketStateBody
+        
     ) const;
     /// <summary>
     /// 
@@ -339,15 +551,9 @@ class  DefaultApi
     /// <param name="maxValue"> (optional, default to 0.0)</param>
     /// <param name="limit"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<CombineQuestionResultsWithCommentsResponse>> combineCommentsWithQuestionResults(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> questionId,
-        boost::optional<std::vector<utility::string_t>> questionIds,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<utility::datetime> startDate,
-        boost::optional<bool> forceRecalculate,
-        boost::optional<double> minValue,
-        boost::optional<double> maxValue,
-        boost::optional<double> limit
+        utility::string_t tenantId
+        
+        , const CombineCommentsWithQuestionResultsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -360,6 +566,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateEmailTemplateResponse>> createEmailTemplate(
         utility::string_t tenantId,
         std::shared_ptr<CreateEmailTemplateBody> createEmailTemplateBody
+        
     ) const;
     /// <summary>
     /// 
@@ -375,11 +582,9 @@ class  DefaultApi
     /// <param name="skipDupCheck"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<CreateFeedPostsResponse>> createFeedPost(
         utility::string_t tenantId,
-        std::shared_ptr<CreateFeedPostParams> createFeedPostParams,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<bool> isLive,
-        boost::optional<bool> doSpamCheck,
-        boost::optional<bool> skipDupCheck
+        std::shared_ptr<CreateFeedPostParams> createFeedPostParams
+        
+        , const CreateFeedPostOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -392,6 +597,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateModeratorResponse>> createModerator(
         utility::string_t tenantId,
         std::shared_ptr<CreateModeratorBody> createModeratorBody
+        
     ) const;
     /// <summary>
     /// 
@@ -404,6 +610,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateQuestionConfigResponse>> createQuestionConfig(
         utility::string_t tenantId,
         std::shared_ptr<CreateQuestionConfigBody> createQuestionConfigBody
+        
     ) const;
     /// <summary>
     /// 
@@ -416,6 +623,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateQuestionResultResponse>> createQuestionResult(
         utility::string_t tenantId,
         std::shared_ptr<CreateQuestionResultBody> createQuestionResultBody
+        
     ) const;
     /// <summary>
     /// 
@@ -428,6 +636,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateSubscriptionAPIResponse>> createSubscription(
         utility::string_t tenantId,
         std::shared_ptr<CreateAPIUserSubscriptionData> createAPIUserSubscriptionData
+        
     ) const;
     /// <summary>
     /// 
@@ -440,6 +649,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateTenantResponse>> createTenant(
         utility::string_t tenantId,
         std::shared_ptr<CreateTenantBody> createTenantBody
+        
     ) const;
     /// <summary>
     /// 
@@ -452,6 +662,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateTenantPackageResponse>> createTenantPackage(
         utility::string_t tenantId,
         std::shared_ptr<CreateTenantPackageBody> createTenantPackageBody
+        
     ) const;
     /// <summary>
     /// 
@@ -464,6 +675,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<CreateTenantUserResponse>> createTenantUser(
         utility::string_t tenantId,
         std::shared_ptr<CreateTenantUserBody> createTenantUserBody
+        
     ) const;
     /// <summary>
     /// 
@@ -478,6 +690,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t userId,
         std::shared_ptr<CreateTicketBody> createTicketBody
+        
     ) const;
     /// <summary>
     /// 
@@ -490,6 +703,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APICreateUserBadgeResponse>> createUserBadge(
         utility::string_t tenantId,
         std::shared_ptr<CreateUserBadgeParams> createUserBadgeParams
+        
     ) const;
     /// <summary>
     /// 
@@ -505,9 +719,9 @@ class  DefaultApi
     pplx::task<std::shared_ptr<VoteResponse>> createVote(
         utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t direction,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId
+        utility::string_t direction
+        
+        , const CreateVoteOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -521,9 +735,9 @@ class  DefaultApi
     /// <param name="isLive"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<DeleteCommentResult>> deleteComment(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> contextUserId,
-        boost::optional<bool> isLive
+        utility::string_t id
+        
+        , const DeleteCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -536,6 +750,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<DeleteDomainConfigResponse>> deleteDomainConfig(
         utility::string_t tenantId,
         utility::string_t domain
+        
     ) const;
     /// <summary>
     /// 
@@ -548,6 +763,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteEmailTemplate(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -562,6 +778,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         utility::string_t errorId
+        
     ) const;
     /// <summary>
     /// 
@@ -569,13 +786,14 @@ class  DefaultApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="tag"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="deleteHashTagRequestBody"> (optional)</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteHashTag(
+        utility::string_t tenantId,
         utility::string_t tag,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<std::shared_ptr<DeleteHashTagRequestBody>> deleteHashTagRequestBody
+        std::shared_ptr<DeleteHashTagRequestBody> deleteHashTagRequestBody
+        
     ) const;
     /// <summary>
     /// 
@@ -588,8 +806,8 @@ class  DefaultApi
     /// <param name="sendEmail"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteModerator(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> sendEmail
+        utility::string_t id
+        , boost::optional<utility::string_t> sendEmail = boost::none
     ) const;
     /// <summary>
     /// 
@@ -602,6 +820,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteNotificationCount(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -614,6 +833,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<DeletePageAPIResponse>> deletePage(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -626,6 +846,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> deletePendingWebhookEvent(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -638,6 +859,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteQuestionConfig(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -650,6 +872,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteQuestionResult(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -663,9 +886,9 @@ class  DefaultApi
     /// <param name="commentDeleteMode"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<DeleteSSOUserAPIResponse>> deleteSSOUser(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<bool> deleteComments,
-        boost::optional<utility::string_t> commentDeleteMode
+        utility::string_t id
+        
+        , const DeleteSSOUserOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -678,8 +901,8 @@ class  DefaultApi
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<DeleteSubscriptionAPIResponse>> deleteSubscription(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> userId
+        utility::string_t id
+        , boost::optional<utility::string_t> userId = boost::none
     ) const;
     /// <summary>
     /// 
@@ -692,8 +915,8 @@ class  DefaultApi
     /// <param name="sure"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteTenant(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> sure
+        utility::string_t id
+        , boost::optional<utility::string_t> sure = boost::none
     ) const;
     /// <summary>
     /// 
@@ -706,6 +929,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteTenantPackage(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -719,9 +943,9 @@ class  DefaultApi
     /// <param name="commentDeleteMode"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> deleteTenantUser(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> deleteComments,
-        boost::optional<utility::string_t> commentDeleteMode
+        utility::string_t id
+        
+        , const DeleteTenantUserOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -734,6 +958,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptySuccessResponse>> deleteUserBadge(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -746,8 +971,8 @@ class  DefaultApi
     /// <param name="editKey"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<VoteDeleteResponse>> deleteVote(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> editKey
+        utility::string_t id
+        , boost::optional<utility::string_t> editKey = boost::none
     ) const;
     /// <summary>
     /// 
@@ -761,9 +986,9 @@ class  DefaultApi
     /// <param name="anonUserId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<FlagCommentResponse>> flagComment(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId
+        utility::string_t id
+        
+        , const FlagCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -778,12 +1003,9 @@ class  DefaultApi
     /// <param name="after"> (optional, default to 0.0)</param>
     /// <param name="before"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetAuditLogsResponse>> getAuditLogs(
-        utility::string_t tenantId,
-        boost::optional<double> limit,
-        boost::optional<double> skip,
-        boost::optional<std::shared_ptr<SORT_DIR>> order,
-        boost::optional<double> after,
-        boost::optional<double> before
+        utility::string_t tenantId
+        
+        , const GetAuditLogsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -796,6 +1018,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetCachedNotificationCountResponse>> getCachedNotificationCount(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -808,6 +1031,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIGetCommentResponse>> getComment(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -833,23 +1057,9 @@ class  DefaultApi
     /// <param name="fromDate"> (optional, default to 0L)</param>
     /// <param name="toDate"> (optional, default to 0L)</param>
     pplx::task<std::shared_ptr<APIGetCommentsResponse>> getComments(
-        utility::string_t tenantId,
-        boost::optional<int32_t> page,
-        boost::optional<int32_t> limit,
-        boost::optional<int32_t> skip,
-        boost::optional<bool> asTree,
-        boost::optional<int32_t> skipChildren,
-        boost::optional<int32_t> limitChildren,
-        boost::optional<int32_t> maxTreeDepth,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId,
-        boost::optional<utility::string_t> contextUserId,
-        boost::optional<utility::string_t> hashTag,
-        boost::optional<utility::string_t> parentId,
-        boost::optional<std::shared_ptr<SortDirections>> direction,
-        boost::optional<int64_t> fromDate,
-        boost::optional<int64_t> toDate
+        utility::string_t tenantId
+        
+        , const GetCommentsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -862,6 +1072,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetDomainConfigResponse>> getDomainConfig(
         utility::string_t tenantId,
         utility::string_t domain
+        
     ) const;
     /// <summary>
     /// 
@@ -872,6 +1083,7 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     pplx::task<std::shared_ptr<GetDomainConfigsResponse>> getDomainConfigs(
         utility::string_t tenantId
+        
     ) const;
     /// <summary>
     /// 
@@ -884,6 +1096,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetEmailTemplateResponse>> getEmailTemplate(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -894,6 +1107,7 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     pplx::task<std::shared_ptr<GetEmailTemplateDefinitionsResponse>> getEmailTemplateDefinitions(
         utility::string_t tenantId
+        
     ) const;
     /// <summary>
     /// 
@@ -906,8 +1120,8 @@ class  DefaultApi
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetEmailTemplateRenderErrorsResponse>> getEmailTemplateRenderErrors(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<double> skip
+        utility::string_t id
+        , boost::optional<double> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -918,8 +1132,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetEmailTemplatesResponse>> getEmailTemplates(
-        utility::string_t tenantId,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        , boost::optional<double> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -932,10 +1146,9 @@ class  DefaultApi
     /// <param name="limit"> (optional, default to 0)</param>
     /// <param name="tags"> (optional, default to std::vector&lt;std::shared_ptr&lt;utility::string_t&gt;&gt;())</param>
     pplx::task<std::shared_ptr<GetFeedPostsResponse>> getFeedPosts(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> afterId,
-        boost::optional<int32_t> limit,
-        boost::optional<std::vector<utility::string_t>> tags
+        utility::string_t tenantId
+        
+        , const GetFeedPostsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -946,8 +1159,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="page"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetHashTagsResponse>> getHashTags(
-        utility::string_t tenantId,
-        boost::optional<double> page
+        utility::string_t tenantId
+        , boost::optional<double> page = boost::none
     ) const;
     /// <summary>
     /// 
@@ -960,6 +1173,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetModeratorResponse>> getModerator(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -970,8 +1184,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetModeratorsResponse>> getModerators(
-        utility::string_t tenantId,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        , boost::optional<double> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -986,12 +1200,9 @@ class  DefaultApi
     /// <param name="viewed"> (optional, default to false)</param>
     /// <param name="type"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetNotificationCountResponse>> getNotificationCount(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<utility::string_t> fromCommentId,
-        boost::optional<bool> viewed,
-        boost::optional<utility::string_t> type
+        utility::string_t tenantId
+        
+        , const GetNotificationCountOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1007,13 +1218,9 @@ class  DefaultApi
     /// <param name="type"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetNotificationsResponse>> getNotifications(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<utility::string_t> fromCommentId,
-        boost::optional<bool> viewed,
-        boost::optional<utility::string_t> type,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetNotificationsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1026,6 +1233,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetPageByURLIdAPIResponse>> getPageByURLId(
         utility::string_t tenantId,
         utility::string_t urlId
+        
     ) const;
     /// <summary>
     /// 
@@ -1036,6 +1244,7 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     pplx::task<std::shared_ptr<GetPagesAPIResponse>> getPages(
         utility::string_t tenantId
+        
     ) const;
     /// <summary>
     /// 
@@ -1051,13 +1260,9 @@ class  DefaultApi
     /// <param name="domain"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="attemptCountGT"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetPendingWebhookEventCountResponse>> getPendingWebhookEventCount(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> commentId,
-        boost::optional<utility::string_t> externalId,
-        boost::optional<utility::string_t> eventType,
-        boost::optional<utility::string_t> type,
-        boost::optional<utility::string_t> domain,
-        boost::optional<double> attemptCountGT
+        utility::string_t tenantId
+        
+        , const GetPendingWebhookEventCountOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1074,14 +1279,9 @@ class  DefaultApi
     /// <param name="attemptCountGT"> (optional, default to 0.0)</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetPendingWebhookEventsResponse>> getPendingWebhookEvents(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> commentId,
-        boost::optional<utility::string_t> externalId,
-        boost::optional<utility::string_t> eventType,
-        boost::optional<utility::string_t> type,
-        boost::optional<utility::string_t> domain,
-        boost::optional<double> attemptCountGT,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetPendingWebhookEventsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1094,6 +1294,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetQuestionConfigResponse>> getQuestionConfig(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1104,8 +1305,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetQuestionConfigsResponse>> getQuestionConfigs(
-        utility::string_t tenantId,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        , boost::optional<double> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1118,6 +1319,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetQuestionResultResponse>> getQuestionResult(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1133,13 +1335,9 @@ class  DefaultApi
     /// <param name="questionIds"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetQuestionResultsResponse>> getQuestionResults(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> startDate,
-        boost::optional<utility::string_t> questionId,
-        boost::optional<utility::string_t> questionIds,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetQuestionResultsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1152,6 +1350,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetSSOUserByEmailAPIResponse>> getSSOUserByEmail(
         utility::string_t tenantId,
         utility::string_t email
+        
     ) const;
     /// <summary>
     /// 
@@ -1164,6 +1363,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetSSOUserByIdAPIResponse>> getSSOUserById(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1174,8 +1374,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="skip"> (optional, default to 0)</param>
     pplx::task<std::shared_ptr<GetSSOUsersResponse>> getSSOUsers(
-        utility::string_t tenantId,
-        boost::optional<int32_t> skip
+        utility::string_t tenantId
+        , boost::optional<int32_t> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1186,8 +1386,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetSubscriptionsAPIResponse>> getSubscriptions(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> userId
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> userId = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1200,6 +1400,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetTenantResponse>> getTenant(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1213,11 +1414,9 @@ class  DefaultApi
     /// <param name="dayNumber"> (optional, default to 0.0)</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetTenantDailyUsagesResponse>> getTenantDailyUsages(
-        utility::string_t tenantId,
-        boost::optional<double> yearNumber,
-        boost::optional<double> monthNumber,
-        boost::optional<double> dayNumber,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetTenantDailyUsagesOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1230,6 +1429,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetTenantPackageResponse>> getTenantPackage(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1240,8 +1440,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetTenantPackagesResponse>> getTenantPackages(
-        utility::string_t tenantId,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        , boost::optional<double> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1254,6 +1454,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetTenantUserResponse>> getTenantUser(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1264,8 +1465,8 @@ class  DefaultApi
     /// <param name="tenantId"></param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetTenantUsersResponse>> getTenantUsers(
-        utility::string_t tenantId,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        , boost::optional<double> skip = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1277,9 +1478,9 @@ class  DefaultApi
     /// <param name="meta"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetTenantsResponse>> getTenants(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> meta,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetTenantsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1292,8 +1493,8 @@ class  DefaultApi
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetTicketResponse>> getTicket(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> userId
+        utility::string_t id
+        , boost::optional<utility::string_t> userId = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1307,11 +1508,9 @@ class  DefaultApi
     /// <param name="skip"> (optional, default to 0.0)</param>
     /// <param name="limit"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetTicketsResponse>> getTickets(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<double> state,
-        boost::optional<double> skip,
-        boost::optional<double> limit
+        utility::string_t tenantId
+        
+        , const GetTicketsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1324,6 +1523,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetUserResponse>> getUser(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1336,6 +1536,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIGetUserBadgeResponse>> getUserBadge(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1348,6 +1549,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> getUserBadgeProgressById(
         utility::string_t tenantId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -1360,6 +1562,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> getUserBadgeProgressByUserId(
         utility::string_t tenantId,
         utility::string_t userId
+        
     ) const;
     /// <summary>
     /// 
@@ -1372,10 +1575,9 @@ class  DefaultApi
     /// <param name="limit"> (optional, default to 0.0)</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<APIGetUserBadgeProgressListResponse>> getUserBadgeProgressList(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<double> limit,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetUserBadgeProgressListOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1391,13 +1593,9 @@ class  DefaultApi
     /// <param name="limit"> (optional, default to 0.0)</param>
     /// <param name="skip"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<APIGetUserBadgesResponse>> getUserBadges(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> badgeId,
-        boost::optional<double> type,
-        boost::optional<bool> displayedOnComments,
-        boost::optional<double> limit,
-        boost::optional<double> skip
+        utility::string_t tenantId
+        
+        , const GetUserBadgesOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1410,6 +1608,7 @@ class  DefaultApi
     pplx::task<std::shared_ptr<GetVotesResponse>> getVotes(
         utility::string_t tenantId,
         utility::string_t urlId
+        
     ) const;
     /// <summary>
     /// 
@@ -1423,9 +1622,9 @@ class  DefaultApi
     /// <param name="anonUserId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetVotesForUserResponse>> getVotesForUser(
         utility::string_t tenantId,
-        utility::string_t urlId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId
+        utility::string_t urlId
+        
+        , const GetVotesForUserOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1440,6 +1639,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t domainToUpdate,
         std::shared_ptr<PatchDomainConfigParams> patchDomainConfigParams
+        
     ) const;
     /// <summary>
     /// 
@@ -1447,13 +1647,14 @@ class  DefaultApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="tag"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="updateHashTagBody"> (optional)</param>
     pplx::task<std::shared_ptr<UpdateHashTagResponse>> patchHashTag(
+        utility::string_t tenantId,
         utility::string_t tag,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<std::shared_ptr<UpdateHashTagBody>> updateHashTagBody
+        std::shared_ptr<UpdateHashTagBody> updateHashTagBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1468,6 +1669,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateAPIPageData> updateAPIPageData
+        
     ) const;
     /// <summary>
     /// 
@@ -1482,8 +1684,8 @@ class  DefaultApi
     pplx::task<std::shared_ptr<PatchSSOUserAPIResponse>> patchSSOUser(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData,
-        boost::optional<bool> updateComments
+        std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData
+        , boost::optional<bool> updateComments = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1498,6 +1700,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t domainToUpdate,
         std::shared_ptr<UpdateDomainConfigParams> updateDomainConfigParams
+        
     ) const;
     /// <summary>
     /// 
@@ -1512,8 +1715,8 @@ class  DefaultApi
     pplx::task<std::shared_ptr<PutSSOUserAPIResponse>> putSSOUser(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData,
-        boost::optional<bool> updateComments
+        std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData
+        , boost::optional<bool> updateComments = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1526,8 +1729,8 @@ class  DefaultApi
     /// <param name="locale"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<RenderEmailTemplateResponse>> renderEmailTemplate(
         utility::string_t tenantId,
-        std::shared_ptr<RenderEmailTemplateBody> renderEmailTemplateBody,
-        boost::optional<utility::string_t> locale
+        std::shared_ptr<RenderEmailTemplateBody> renderEmailTemplateBody
+        , boost::optional<utility::string_t> locale = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1542,6 +1745,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<ReplaceTenantPackageBody> replaceTenantPackageBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1556,8 +1760,8 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> replaceTenantUser(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<ReplaceTenantUserBody> replaceTenantUserBody,
-        boost::optional<utility::string_t> updateComments
+        std::shared_ptr<ReplaceTenantUserBody> replaceTenantUserBody
+        , boost::optional<utility::string_t> updateComments = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1573,11 +1777,9 @@ class  DefaultApi
     /// <param name="populateNotifications"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<APISaveCommentResponse>> saveComment(
         utility::string_t tenantId,
-        std::shared_ptr<CreateCommentParams> createCommentParams,
-        boost::optional<bool> isLive,
-        boost::optional<bool> doSpamCheck,
-        boost::optional<bool> sendEmails,
-        boost::optional<bool> populateNotifications
+        std::shared_ptr<CreateCommentParams> createCommentParams
+        
+        , const SaveCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1593,11 +1795,9 @@ class  DefaultApi
     /// <param name="populateNotifications"> (optional, default to false)</param>
     pplx::task<std::vector<std::shared_ptr<SaveCommentsBulkResponse>>> saveCommentsBulk(
         utility::string_t tenantId,
-        std::vector<std::shared_ptr<CreateCommentParams>> createCommentParams,
-        boost::optional<bool> isLive,
-        boost::optional<bool> doSpamCheck,
-        boost::optional<bool> sendEmails,
-        boost::optional<bool> populateNotifications
+        std::vector<std::shared_ptr<CreateCommentParams>> createCommentParams
+        
+        , const SaveCommentsBulkOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1612,6 +1812,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         utility::string_t fromName
+        
     ) const;
     /// <summary>
     /// 
@@ -1624,8 +1825,8 @@ class  DefaultApi
     /// <param name="redirectURL"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> sendLoginLink(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> redirectURL
+        utility::string_t id
+        , boost::optional<utility::string_t> redirectURL = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1641,9 +1842,9 @@ class  DefaultApi
     pplx::task<std::shared_ptr<UnblockSuccess>> unBlockUserFromComment(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UnBlockFromCommentParams> unBlockFromCommentParams,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId
+        std::shared_ptr<UnBlockFromCommentParams> unBlockFromCommentParams
+        
+        , const UnBlockUserFromCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1657,9 +1858,9 @@ class  DefaultApi
     /// <param name="anonUserId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<FlagCommentResponse>> unFlagComment(
         utility::string_t tenantId,
-        utility::string_t id,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> anonUserId
+        utility::string_t id
+        
+        , const UnFlagCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1676,10 +1877,9 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> updateComment(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UpdatableCommentParams> updatableCommentParams,
-        boost::optional<utility::string_t> contextUserId,
-        boost::optional<bool> doSpamCheck,
-        boost::optional<bool> isLive
+        std::shared_ptr<UpdatableCommentParams> updatableCommentParams
+        
+        , const UpdateCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1694,6 +1894,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateEmailTemplateBody> updateEmailTemplateBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1708,6 +1909,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<FeedPost> feedPost
+        
     ) const;
     /// <summary>
     /// 
@@ -1722,6 +1924,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateModeratorBody> updateModeratorBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1736,8 +1939,8 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> updateNotification(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UpdateNotificationBody> updateNotificationBody,
-        boost::optional<utility::string_t> userId
+        std::shared_ptr<UpdateNotificationBody> updateNotificationBody
+        , boost::optional<utility::string_t> userId = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1752,6 +1955,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateQuestionConfigBody> updateQuestionConfigBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1766,6 +1970,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateQuestionResultBody> updateQuestionResultBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1780,8 +1985,8 @@ class  DefaultApi
     pplx::task<std::shared_ptr<UpdateSubscriptionAPIResponse>> updateSubscription(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UpdateAPIUserSubscriptionData> updateAPIUserSubscriptionData,
-        boost::optional<utility::string_t> userId
+        std::shared_ptr<UpdateAPIUserSubscriptionData> updateAPIUserSubscriptionData
+        , boost::optional<utility::string_t> userId = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1796,6 +2001,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateTenantBody> updateTenantBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1810,6 +2016,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateTenantPackageBody> updateTenantPackageBody
+        
     ) const;
     /// <summary>
     /// 
@@ -1824,8 +2031,8 @@ class  DefaultApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> updateTenantUser(
         utility::string_t tenantId,
         utility::string_t id,
-        std::shared_ptr<UpdateTenantUserBody> updateTenantUserBody,
-        boost::optional<utility::string_t> updateComments
+        std::shared_ptr<UpdateTenantUserBody> updateTenantUserBody
+        , boost::optional<utility::string_t> updateComments = boost::none
     ) const;
     /// <summary>
     /// 
@@ -1840,6 +2047,7 @@ class  DefaultApi
         utility::string_t tenantId,
         utility::string_t id,
         std::shared_ptr<UpdateUserBadgeParams> updateUserBadgeParams
+        
     ) const;
 
 protected:
diff --git a/client/include/FastCommentsClient/api/ModerationApi.h b/client/include/FastCommentsClient/api/ModerationApi.h
index 6df1ae7..53c4b59 100644
--- a/client/include/FastCommentsClient/api/ModerationApi.h
+++ b/client/include/FastCommentsClient/api/ModerationApi.h
@@ -54,7 +54,7 @@
 #include "FastCommentsClient/model/ModerationSiteSearchResponse.h"
 #include "FastCommentsClient/model/ModerationSuggestResponse.h"
 #include "FastCommentsClient/model/ModerationUserSearchResponse.h"
-#include "FastCommentsClient/model/PostRemoveCommentResponse.h"
+#include "FastCommentsClient/model/PostRemoveCommentApiResponse.h"
 #include "FastCommentsClient/model/PreBanSummary.h"
 #include "FastCommentsClient/model/RemoveUserBadgeResponse.h"
 #include "FastCommentsClient/model/SetCommentApprovedResponse.h"
@@ -73,6 +73,207 @@ namespace api {
 
 using namespace org::openapitools::client::model;
 
+struct DeleteModerationVoteOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct GetApiCommentsOptions
+{
+    boost::optional<double> page;
+    boost::optional<double> count;
+    boost::optional<utility::string_t> textSearch;
+    boost::optional<utility::string_t> byIPFromComment;
+    boost::optional<utility::string_t> filters;
+    boost::optional<utility::string_t> searchFilters;
+    boost::optional<utility::string_t> sorts;
+    boost::optional<bool> demo;
+    boost::optional<utility::string_t> sso;
+};
+struct GetApiExportStatusOptions
+{
+    boost::optional<utility::string_t> batchJobId;
+    boost::optional<utility::string_t> sso;
+};
+struct GetApiIdsOptions
+{
+    boost::optional<utility::string_t> textSearch;
+    boost::optional<utility::string_t> byIPFromComment;
+    boost::optional<utility::string_t> filters;
+    boost::optional<utility::string_t> searchFilters;
+    boost::optional<utility::string_t> afterId;
+    boost::optional<bool> demo;
+    boost::optional<utility::string_t> sso;
+};
+struct GetCountOptions
+{
+    boost::optional<utility::string_t> textSearch;
+    boost::optional<utility::string_t> byIPFromComment;
+    boost::optional<utility::string_t> filter;
+    boost::optional<utility::string_t> searchFilters;
+    boost::optional<bool> demo;
+    boost::optional<utility::string_t> sso;
+};
+struct GetManualBadgesForUserOptions
+{
+    boost::optional<utility::string_t> badgesUserId;
+    boost::optional<utility::string_t> commentId;
+    boost::optional<utility::string_t> sso;
+};
+struct GetModerationCommentOptions
+{
+    boost::optional<bool> includeEmail;
+    boost::optional<bool> includeIP;
+    boost::optional<utility::string_t> sso;
+};
+struct GetPreBanSummaryOptions
+{
+    boost::optional<bool> includeByUserIdAndEmail;
+    boost::optional<bool> includeByIP;
+    boost::optional<bool> includeByEmailDomain;
+    boost::optional<utility::string_t> sso;
+};
+struct GetSearchCommentsSummaryOptions
+{
+    boost::optional<utility::string_t> value;
+    boost::optional<utility::string_t> filters;
+    boost::optional<utility::string_t> searchFilters;
+    boost::optional<utility::string_t> sso;
+};
+struct GetSearchPagesOptions
+{
+    boost::optional<utility::string_t> value;
+    boost::optional<utility::string_t> sso;
+};
+struct GetSearchSitesOptions
+{
+    boost::optional<utility::string_t> value;
+    boost::optional<utility::string_t> sso;
+};
+struct GetSearchSuggestOptions
+{
+    boost::optional<utility::string_t> textSearch;
+    boost::optional<utility::string_t> sso;
+};
+struct GetSearchUsersOptions
+{
+    boost::optional<utility::string_t> value;
+    boost::optional<utility::string_t> sso;
+};
+struct GetTrustFactorOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> sso;
+};
+struct GetUserInternalProfileOptions
+{
+    boost::optional<utility::string_t> commentId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostAdjustCommentVotesOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostApiExportOptions
+{
+    boost::optional<utility::string_t> textSearch;
+    boost::optional<utility::string_t> byIPFromComment;
+    boost::optional<utility::string_t> filters;
+    boost::optional<utility::string_t> searchFilters;
+    boost::optional<utility::string_t> sorts;
+    boost::optional<utility::string_t> sso;
+};
+struct PostBanUserFromCommentOptions
+{
+    boost::optional<bool> banEmail;
+    boost::optional<bool> banEmailDomain;
+    boost::optional<bool> banIP;
+    boost::optional<bool> deleteAllUsersComments;
+    boost::optional<utility::string_t> bannedUntil;
+    boost::optional<bool> isShadowBan;
+    boost::optional<utility::string_t> updateId;
+    boost::optional<utility::string_t> banReason;
+    boost::optional<utility::string_t> sso;
+};
+struct PostBulkPreBanSummaryOptions
+{
+    boost::optional<bool> includeByUserIdAndEmail;
+    boost::optional<bool> includeByIP;
+    boost::optional<bool> includeByEmailDomain;
+    boost::optional<utility::string_t> sso;
+};
+struct PostFlagCommentOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostRemoveCommentOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostRestoreDeletedCommentOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostSetCommentApprovalStatusOptions
+{
+    boost::optional<bool> approved;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostSetCommentReviewStatusOptions
+{
+    boost::optional<bool> reviewed;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostSetCommentSpamStatusOptions
+{
+    boost::optional<bool> spam;
+    boost::optional<bool> permNotSpam;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostSetCommentTextOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostUnFlagCommentOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PostVoteOptions
+{
+    boost::optional<utility::string_t> direction;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PutAwardBadgeOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> commentId;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct PutRemoveBadgeOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> commentId;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct SetTrustFactorOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> trustFactor;
+    boost::optional<utility::string_t> sso;
+};
+
 
 
 class  ModerationApi 
@@ -89,17 +290,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="voteId"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<VoteDeleteResponse>> deleteModerationVote(
+        utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t voteId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t voteId
+        
+        , const DeleteModerationVoteOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -107,6 +308,7 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="page"> (optional, default to 0.0)</param>
     /// <param name="count"> (optional, default to 0.0)</param>
     /// <param name="textSearch"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
@@ -115,19 +317,11 @@ class  ModerationApi
     /// <param name="searchFilters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sorts"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="demo"> (optional, default to false)</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPIGetCommentsResponse>> getApiComments(
-        boost::optional<double> page,
-        boost::optional<double> count,
-        boost::optional<utility::string_t> textSearch,
-        boost::optional<utility::string_t> byIPFromComment,
-        boost::optional<utility::string_t> filters,
-        boost::optional<utility::string_t> searchFilters,
-        boost::optional<utility::string_t> sorts,
-        boost::optional<bool> demo,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetApiCommentsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -135,13 +329,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="batchJobId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationExportStatusResponse>> getApiExportStatus(
-        boost::optional<utility::string_t> batchJobId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetApiExportStatusOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -149,23 +343,18 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="textSearch"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="byIPFromComment"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="filters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="searchFilters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="afterId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="demo"> (optional, default to false)</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPIGetCommentIdsResponse>> getApiIds(
-        boost::optional<utility::string_t> textSearch,
-        boost::optional<utility::string_t> byIPFromComment,
-        boost::optional<utility::string_t> filters,
-        boost::optional<utility::string_t> searchFilters,
-        boost::optional<utility::string_t> afterId,
-        boost::optional<bool> demo,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetApiIdsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -173,13 +362,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetBannedUsersFromCommentResponse>> getBanUsersFromComment(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -187,13 +376,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetCommentBanStatusResponse>> getCommentBanStatus(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -201,13 +390,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> getCommentChildren(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -215,21 +404,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="textSearch"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="byIPFromComment"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="filter"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="searchFilters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="demo"> (optional, default to false)</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPICountCommentsResponse>> getCount(
-        boost::optional<utility::string_t> textSearch,
-        boost::optional<utility::string_t> byIPFromComment,
-        boost::optional<utility::string_t> filter,
-        boost::optional<utility::string_t> searchFilters,
-        boost::optional<bool> demo,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetCountOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -237,11 +422,11 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
+    /// <param name="tenantId"></param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetBannedUsersCountResponse>> getCounts(
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -249,13 +434,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPIGetLogsResponse>> getLogs(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -263,11 +448,11 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
+    /// <param name="tenantId"></param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetTenantManualBadgesResponse>> getManualBadges(
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -275,15 +460,14 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="badgesUserId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="commentId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetUserManualBadgesResponse>> getManualBadgesForUser(
-        boost::optional<utility::string_t> badgesUserId,
-        boost::optional<utility::string_t> commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetManualBadgesForUserOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -291,17 +475,16 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="includeEmail"> (optional, default to false)</param>
     /// <param name="includeIP"> (optional, default to false)</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPICommentResponse>> getModerationComment(
-        utility::string_t commentId,
-        boost::optional<bool> includeEmail,
-        boost::optional<bool> includeIP,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const GetModerationCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -309,13 +492,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetCommentTextResponse>> getModerationCommentText(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -323,19 +506,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="includeByUserIdAndEmail"> (optional, default to false)</param>
     /// <param name="includeByIP"> (optional, default to false)</param>
     /// <param name="includeByEmailDomain"> (optional, default to false)</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<PreBanSummary>> getPreBanSummary(
-        utility::string_t commentId,
-        boost::optional<bool> includeByUserIdAndEmail,
-        boost::optional<bool> includeByIP,
-        boost::optional<bool> includeByEmailDomain,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const GetPreBanSummaryOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -343,17 +524,15 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="value"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="filters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="searchFilters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationCommentSearchResponse>> getSearchCommentsSummary(
-        boost::optional<utility::string_t> value,
-        boost::optional<utility::string_t> filters,
-        boost::optional<utility::string_t> searchFilters,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetSearchCommentsSummaryOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -361,13 +540,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="value"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationPageSearchResponse>> getSearchPages(
-        boost::optional<utility::string_t> value,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetSearchPagesOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -375,13 +554,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="value"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationSiteSearchResponse>> getSearchSites(
-        boost::optional<utility::string_t> value,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetSearchSitesOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -389,13 +568,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="textSearch"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationSuggestResponse>> getSearchSuggest(
-        boost::optional<utility::string_t> textSearch,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetSearchSuggestOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -403,13 +582,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="value"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationUserSearchResponse>> getSearchUsers(
-        boost::optional<utility::string_t> value,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetSearchUsersOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -417,13 +596,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetUserTrustFactorResponse>> getTrustFactor(
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetTrustFactorOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -431,11 +610,11 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
+    /// <param name="tenantId"></param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIModerateGetUserBanPreferencesResponse>> getUserBanPreference(
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -443,13 +622,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetUserInternalProfileResponse>> getUserInternalProfile(
-        boost::optional<utility::string_t> commentId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetUserInternalProfileOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -457,17 +636,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="adjustCommentVotesParams"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<AdjustVotesResponse>> postAdjustCommentVotes(
+        utility::string_t tenantId,
         utility::string_t commentId,
-        std::shared_ptr<AdjustCommentVotesParams> adjustCommentVotesParams,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<AdjustCommentVotesParams> adjustCommentVotesParams
+        
+        , const PostAdjustCommentVotesOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -475,21 +654,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="textSearch"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="byIPFromComment"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="filters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="searchFilters"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sorts"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationExportResponse>> postApiExport(
-        boost::optional<utility::string_t> textSearch,
-        boost::optional<utility::string_t> byIPFromComment,
-        boost::optional<utility::string_t> filters,
-        boost::optional<utility::string_t> searchFilters,
-        boost::optional<utility::string_t> sorts,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const PostApiExportOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -497,6 +672,7 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="banEmail"> (optional, default to false)</param>
     /// <param name="banEmailDomain"> (optional, default to false)</param>
@@ -506,20 +682,12 @@ class  ModerationApi
     /// <param name="isShadowBan"> (optional, default to false)</param>
     /// <param name="updateId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="banReason"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<BanUserFromCommentResult>> postBanUserFromComment(
-        utility::string_t commentId,
-        boost::optional<bool> banEmail,
-        boost::optional<bool> banEmailDomain,
-        boost::optional<bool> banIP,
-        boost::optional<bool> deleteAllUsersComments,
-        boost::optional<utility::string_t> bannedUntil,
-        boost::optional<bool> isShadowBan,
-        boost::optional<utility::string_t> updateId,
-        boost::optional<utility::string_t> banReason,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostBanUserFromCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -527,13 +695,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="banUserUndoParams"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> postBanUserUndo(
-        std::shared_ptr<BanUserUndoParams> banUserUndoParams,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        std::shared_ptr<BanUserUndoParams> banUserUndoParams
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -541,19 +709,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="bulkPreBanParams"></param>
     /// <param name="includeByUserIdAndEmail"> (optional, default to false)</param>
     /// <param name="includeByIP"> (optional, default to false)</param>
     /// <param name="includeByEmailDomain"> (optional, default to false)</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<BulkPreBanSummary>> postBulkPreBanSummary(
-        std::shared_ptr<BulkPreBanParams> bulkPreBanParams,
-        boost::optional<bool> includeByUserIdAndEmail,
-        boost::optional<bool> includeByIP,
-        boost::optional<bool> includeByEmailDomain,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        std::shared_ptr<BulkPreBanParams> bulkPreBanParams
+        
+        , const PostBulkPreBanSummaryOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -561,13 +727,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentsByIdsParams"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> postCommentsByIds(
-        std::shared_ptr<CommentsByIdsParams> commentsByIdsParams,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        std::shared_ptr<CommentsByIdsParams> commentsByIdsParams
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -575,15 +741,15 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> postFlagComment(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostFlagCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -591,15 +757,15 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    pplx::task<std::shared_ptr<PostRemoveCommentResponse>> postRemoveComment(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+    pplx::task<std::shared_ptr<PostRemoveCommentApiResponse>> postRemoveComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostRemoveCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -607,15 +773,15 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> postRestoreDeletedComment(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostRestoreDeletedCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -623,17 +789,16 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="approved"> (optional, default to false)</param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<SetCommentApprovedResponse>> postSetCommentApprovalStatus(
-        utility::string_t commentId,
-        boost::optional<bool> approved,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostSetCommentApprovalStatusOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -641,17 +806,16 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="reviewed"> (optional, default to false)</param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> postSetCommentReviewStatus(
-        utility::string_t commentId,
-        boost::optional<bool> reviewed,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostSetCommentReviewStatusOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -659,19 +823,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="spam"> (optional, default to false)</param>
     /// <param name="permNotSpam"> (optional, default to false)</param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> postSetCommentSpamStatus(
-        utility::string_t commentId,
-        boost::optional<bool> spam,
-        boost::optional<bool> permNotSpam,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostSetCommentSpamStatusOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -679,17 +841,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="setCommentTextParams"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<SetCommentTextResponse>> postSetCommentText(
+        utility::string_t tenantId,
         utility::string_t commentId,
-        std::shared_ptr<SetCommentTextParams> setCommentTextParams,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<SetCommentTextParams> setCommentTextParams
+        
+        , const PostSetCommentTextOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -697,15 +859,15 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> postUnFlagComment(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostUnFlagCommentOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -713,17 +875,16 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="commentId"></param>
     /// <param name="direction"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<VoteResponse>> postVote(
-        utility::string_t commentId,
-        boost::optional<utility::string_t> direction,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostVoteOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -731,19 +892,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="badgeId"></param>
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="commentId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<AwardUserBadgeResponse>> putAwardBadge(
-        utility::string_t badgeId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> commentId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t badgeId
+        
+        , const PutAwardBadgeOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -751,13 +910,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="urlId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> putCloseThread(
-        utility::string_t urlId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t urlId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -765,19 +924,17 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="badgeId"></param>
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="commentId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="broadcastId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<RemoveUserBadgeResponse>> putRemoveBadge(
-        utility::string_t badgeId,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> commentId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t badgeId
+        
+        , const PutRemoveBadgeOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -785,13 +942,13 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="urlId"></param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<APIEmptyResponse>> putReopenThread(
-        utility::string_t urlId,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId,
+        utility::string_t urlId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -799,15 +956,14 @@ class  ModerationApi
     /// <remarks>
     /// 
     /// </remarks>
+    /// <param name="tenantId"></param>
     /// <param name="userId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="trustFactor"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
-    /// <param name="tenantId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<SetUserTrustFactorResponse>> setTrustFactor(
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> trustFactor,
-        boost::optional<utility::string_t> tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const SetTrustFactorOptions& options = {}
     ) const;
 
 protected:
diff --git a/client/include/FastCommentsClient/api/PublicApi.h b/client/include/FastCommentsClient/api/PublicApi.h
index 29db646..1d79826 100644
--- a/client/include/FastCommentsClient/api/PublicApi.h
+++ b/client/include/FastCommentsClient/api/PublicApi.h
@@ -87,6 +87,181 @@ namespace api {
 
 using namespace org::openapitools::client::model;
 
+struct CreateCommentPublicOptions
+{
+    boost::optional<utility::string_t> sessionId;
+    boost::optional<utility::string_t> sso;
+};
+struct CreateFeedPostPublicOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct DeleteCommentPublicOptions
+{
+    boost::optional<utility::string_t> editKey;
+    boost::optional<utility::string_t> sso;
+};
+struct DeleteCommentVoteOptions
+{
+    boost::optional<utility::string_t> editKey;
+    boost::optional<utility::string_t> sso;
+};
+struct DeleteFeedPostPublicOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct GetCommentTextOptions
+{
+    boost::optional<utility::string_t> editKey;
+    boost::optional<utility::string_t> sso;
+};
+struct GetCommentsForUserOptions
+{
+    boost::optional<utility::string_t> userId;
+    boost::optional<std::shared_ptr<SortDirections>> direction;
+    boost::optional<utility::string_t> repliesToUserId;
+    boost::optional<double> page;
+    boost::optional<bool> includei10n;
+    boost::optional<utility::string_t> locale;
+    boost::optional<bool> isCrawler;
+};
+struct GetCommentsPublicOptions
+{
+    boost::optional<int32_t> page;
+    boost::optional<std::shared_ptr<SortDirections>> direction;
+    boost::optional<utility::string_t> sso;
+    boost::optional<int32_t> skip;
+    boost::optional<int32_t> skipChildren;
+    boost::optional<int32_t> limit;
+    boost::optional<int32_t> limitChildren;
+    boost::optional<bool> countChildren;
+    boost::optional<utility::string_t> fetchPageForCommentId;
+    boost::optional<bool> includeConfig;
+    boost::optional<bool> countAll;
+    boost::optional<bool> includei10n;
+    boost::optional<utility::string_t> locale;
+    boost::optional<utility::string_t> modules;
+    boost::optional<bool> isCrawler;
+    boost::optional<bool> includeNotificationCount;
+    boost::optional<bool> asTree;
+    boost::optional<int32_t> maxTreeDepth;
+    boost::optional<bool> useFullTranslationIds;
+    boost::optional<utility::string_t> parentId;
+    boost::optional<utility::string_t> searchText;
+    boost::optional<std::vector<utility::string_t>> hashTags;
+    boost::optional<utility::string_t> userId;
+    boost::optional<utility::string_t> customConfigStr;
+    boost::optional<utility::string_t> afterCommentId;
+    boost::optional<utility::string_t> beforeCommentId;
+};
+struct GetFeedPostsPublicOptions
+{
+    boost::optional<utility::string_t> afterId;
+    boost::optional<int32_t> limit;
+    boost::optional<std::vector<utility::string_t>> tags;
+    boost::optional<utility::string_t> sso;
+    boost::optional<bool> isCrawler;
+    boost::optional<bool> includeUserInfo;
+};
+struct GetGifsSearchOptions
+{
+    boost::optional<utility::string_t> locale;
+    boost::optional<utility::string_t> rating;
+    boost::optional<double> page;
+};
+struct GetGifsTrendingOptions
+{
+    boost::optional<utility::string_t> locale;
+    boost::optional<utility::string_t> rating;
+    boost::optional<double> page;
+};
+struct GetOfflineUsersOptions
+{
+    boost::optional<utility::string_t> afterName;
+    boost::optional<utility::string_t> afterUserId;
+};
+struct GetOnlineUsersOptions
+{
+    boost::optional<utility::string_t> afterName;
+    boost::optional<utility::string_t> afterUserId;
+};
+struct GetPagesPublicOptions
+{
+    boost::optional<utility::string_t> cursor;
+    boost::optional<int32_t> limit;
+    boost::optional<utility::string_t> q;
+    boost::optional<std::shared_ptr<PagesSortBy>> sortBy;
+    boost::optional<bool> hasComments;
+};
+struct GetTranslationsOptions
+{
+    boost::optional<utility::string_t> locale;
+    boost::optional<bool> useFullTranslationIds;
+};
+struct GetUserNotificationsOptions
+{
+    boost::optional<utility::string_t> urlId;
+    boost::optional<int32_t> pageSize;
+    boost::optional<utility::string_t> afterId;
+    boost::optional<bool> includeContext;
+    boost::optional<int64_t> afterCreatedAt;
+    boost::optional<bool> unreadOnly;
+    boost::optional<bool> dmOnly;
+    boost::optional<bool> noDm;
+    boost::optional<bool> includeTranslations;
+    boost::optional<bool> includeTenantNotifications;
+    boost::optional<utility::string_t> sso;
+};
+struct GetUserReactsPublicOptions
+{
+    boost::optional<std::vector<utility::string_t>> postIds;
+    boost::optional<utility::string_t> sso;
+};
+struct ReactFeedPostPublicOptions
+{
+    boost::optional<bool> isUndo;
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct ResetUserNotificationsOptions
+{
+    boost::optional<utility::string_t> afterId;
+    boost::optional<int64_t> afterCreatedAt;
+    boost::optional<bool> unreadOnly;
+    boost::optional<bool> dmOnly;
+    boost::optional<bool> noDm;
+    boost::optional<utility::string_t> sso;
+};
+struct SearchUsersOptions
+{
+    boost::optional<utility::string_t> usernameStartsWith;
+    boost::optional<std::vector<utility::string_t>> mentionGroupIds;
+    boost::optional<utility::string_t> sso;
+    boost::optional<utility::string_t> searchSection;
+};
+struct SetCommentTextOptions
+{
+    boost::optional<utility::string_t> editKey;
+    boost::optional<utility::string_t> sso;
+};
+struct UpdateFeedPostPublicOptions
+{
+    boost::optional<utility::string_t> broadcastId;
+    boost::optional<utility::string_t> sso;
+};
+struct UploadImageOptions
+{
+    boost::optional<std::shared_ptr<SizePreset>> sizePreset;
+    boost::optional<utility::string_t> urlId;
+};
+struct VoteCommentOptions
+{
+    boost::optional<utility::string_t> sessionId;
+    boost::optional<utility::string_t> sso;
+};
+
 
 
 class  PublicApi 
@@ -110,8 +285,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<BlockSuccess>> blockFromCommentPublic(
         utility::string_t tenantId,
         utility::string_t commentId,
-        std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -124,8 +299,8 @@ class  PublicApi
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<CheckBlockedCommentsResponse>> checkedCommentsForBlocked(
         utility::string_t tenantId,
-        utility::string_t commentIds,
-        boost::optional<utility::string_t> sso
+        utility::string_t commentIds
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -143,9 +318,9 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t urlId,
         utility::string_t broadcastId,
-        std::shared_ptr<CommentData> commentData,
-        boost::optional<utility::string_t> sessionId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<CommentData> commentData
+        
+        , const CreateCommentPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -159,9 +334,9 @@ class  PublicApi
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<CreateFeedPostResponse>> createFeedPostPublic(
         utility::string_t tenantId,
-        std::shared_ptr<CreateFeedPostParams> createFeedPostParams,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<CreateFeedPostParams> createFeedPostParams
+        
+        , const CreateFeedPostPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -174,8 +349,8 @@ class  PublicApi
     /// <param name="title"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<CreateV1PageReact>> createV1PageReact(
         utility::string_t tenantId,
-        utility::string_t urlId,
-        boost::optional<utility::string_t> title
+        utility::string_t urlId
+        , boost::optional<utility::string_t> title = boost::none
     ) const;
     /// <summary>
     /// 
@@ -190,8 +365,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<CreateV1PageReact>> createV2PageReact(
         utility::string_t tenantId,
         utility::string_t urlId,
-        utility::string_t id,
-        boost::optional<utility::string_t> title
+        utility::string_t id
+        , boost::optional<utility::string_t> title = boost::none
     ) const;
     /// <summary>
     /// 
@@ -207,9 +382,9 @@ class  PublicApi
     pplx::task<std::shared_ptr<PublicAPIDeleteCommentResponse>> deleteCommentPublic(
         utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t broadcastId,
-        boost::optional<utility::string_t> editKey,
-        boost::optional<utility::string_t> sso
+        utility::string_t broadcastId
+        
+        , const DeleteCommentPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -229,9 +404,9 @@ class  PublicApi
         utility::string_t commentId,
         utility::string_t voteId,
         utility::string_t urlId,
-        utility::string_t broadcastId,
-        boost::optional<utility::string_t> editKey,
-        boost::optional<utility::string_t> sso
+        utility::string_t broadcastId
+        
+        , const DeleteCommentVoteOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -245,9 +420,9 @@ class  PublicApi
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<DeleteFeedPostPublicResponse>> deleteFeedPostPublic(
         utility::string_t tenantId,
-        utility::string_t postId,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> sso
+        utility::string_t postId
+        
+        , const DeleteFeedPostPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -260,6 +435,7 @@ class  PublicApi
     pplx::task<std::shared_ptr<CreateV1PageReact>> deleteV1PageReact(
         utility::string_t tenantId,
         utility::string_t urlId
+        
     ) const;
     /// <summary>
     /// 
@@ -274,6 +450,7 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t urlId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -288,8 +465,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> flagCommentPublic(
         utility::string_t tenantId,
         utility::string_t commentId,
-        bool isFlagged,
-        boost::optional<utility::string_t> sso
+        bool isFlagged
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -303,9 +480,9 @@ class  PublicApi
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<PublicAPIGetCommentTextResponse>> getCommentText(
         utility::string_t tenantId,
-        utility::string_t commentId,
-        boost::optional<utility::string_t> editKey,
-        boost::optional<utility::string_t> sso
+        utility::string_t commentId
+        
+        , const GetCommentTextOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -320,8 +497,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<GetCommentVoteUserNamesSuccessResponse>> getCommentVoteUserNames(
         utility::string_t tenantId,
         utility::string_t commentId,
-        int32_t dir,
-        boost::optional<utility::string_t> sso
+        int32_t dir
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -337,13 +514,8 @@ class  PublicApi
     /// <param name="locale"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="isCrawler"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<GetCommentsForUserResponse>> getCommentsForUser(
-        boost::optional<utility::string_t> userId,
-        boost::optional<std::shared_ptr<SortDirections>> direction,
-        boost::optional<utility::string_t> repliesToUserId,
-        boost::optional<double> page,
-        boost::optional<bool> includei10n,
-        boost::optional<utility::string_t> locale,
-        boost::optional<bool> isCrawler
+        
+        const GetCommentsForUserOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -381,33 +553,9 @@ class  PublicApi
     /// <param name="beforeCommentId"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetCommentsResponseWithPresence_PublicComment_>> getCommentsPublic(
         utility::string_t tenantId,
-        utility::string_t urlId,
-        boost::optional<int32_t> page,
-        boost::optional<std::shared_ptr<SortDirections>> direction,
-        boost::optional<utility::string_t> sso,
-        boost::optional<int32_t> skip,
-        boost::optional<int32_t> skipChildren,
-        boost::optional<int32_t> limit,
-        boost::optional<int32_t> limitChildren,
-        boost::optional<bool> countChildren,
-        boost::optional<utility::string_t> fetchPageForCommentId,
-        boost::optional<bool> includeConfig,
-        boost::optional<bool> countAll,
-        boost::optional<bool> includei10n,
-        boost::optional<utility::string_t> locale,
-        boost::optional<utility::string_t> modules,
-        boost::optional<bool> isCrawler,
-        boost::optional<bool> includeNotificationCount,
-        boost::optional<bool> asTree,
-        boost::optional<int32_t> maxTreeDepth,
-        boost::optional<bool> useFullTranslationIds,
-        boost::optional<utility::string_t> parentId,
-        boost::optional<utility::string_t> searchText,
-        boost::optional<std::vector<utility::string_t>> hashTags,
-        boost::optional<utility::string_t> userId,
-        boost::optional<utility::string_t> customConfigStr,
-        boost::optional<utility::string_t> afterCommentId,
-        boost::optional<utility::string_t> beforeCommentId
+        utility::string_t urlId
+        
+        , const GetCommentsPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -424,8 +572,8 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t urlId,
         utility::string_t userIdWS,
-        int64_t startTime,
-        boost::optional<int64_t> endTime
+        int64_t startTime
+        , boost::optional<int64_t> endTime = boost::none
     ) const;
     /// <summary>
     /// 
@@ -441,13 +589,9 @@ class  PublicApi
     /// <param name="isCrawler"> (optional, default to false)</param>
     /// <param name="includeUserInfo"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<PublicFeedPostsResponse>> getFeedPostsPublic(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> afterId,
-        boost::optional<int32_t> limit,
-        boost::optional<std::vector<utility::string_t>> tags,
-        boost::optional<utility::string_t> sso,
-        boost::optional<bool> isCrawler,
-        boost::optional<bool> includeUserInfo
+        utility::string_t tenantId
+        
+        , const GetFeedPostsPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -460,8 +604,8 @@ class  PublicApi
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<FeedPostsStatsResponse>> getFeedPostsStats(
         utility::string_t tenantId,
-        std::vector<utility::string_t> postIds,
-        boost::optional<utility::string_t> sso
+        std::vector<utility::string_t> postIds
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -474,6 +618,7 @@ class  PublicApi
     pplx::task<std::shared_ptr<GifGetLargeResponse>> getGifLarge(
         utility::string_t tenantId,
         utility::string_t largeInternalURLSanitized
+        
     ) const;
     /// <summary>
     /// 
@@ -488,10 +633,9 @@ class  PublicApi
     /// <param name="page"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetGifsSearchResponse>> getGifsSearch(
         utility::string_t tenantId,
-        utility::string_t search,
-        boost::optional<utility::string_t> locale,
-        boost::optional<utility::string_t> rating,
-        boost::optional<double> page
+        utility::string_t search
+        
+        , const GetGifsSearchOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -504,10 +648,9 @@ class  PublicApi
     /// <param name="rating"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     /// <param name="page"> (optional, default to 0.0)</param>
     pplx::task<std::shared_ptr<GetGifsTrendingResponse>> getGifsTrending(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> locale,
-        boost::optional<utility::string_t> rating,
-        boost::optional<double> page
+        utility::string_t tenantId
+        
+        , const GetGifsTrendingOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -524,8 +667,8 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t urlId,
         utility::string_t userIdWS,
-        int64_t startTime,
-        boost::optional<int64_t> endTime
+        int64_t startTime
+        , boost::optional<int64_t> endTime = boost::none
     ) const;
     /// <summary>
     /// 
@@ -539,9 +682,9 @@ class  PublicApi
     /// <param name="afterUserId">Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don&#39;t drop entries. (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<PageUsersOfflineResponse>> getOfflineUsers(
         utility::string_t tenantId,
-        utility::string_t urlId,
-        boost::optional<utility::string_t> afterName,
-        boost::optional<utility::string_t> afterUserId
+        utility::string_t urlId
+        
+        , const GetOfflineUsersOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -555,9 +698,9 @@ class  PublicApi
     /// <param name="afterUserId">Cursor tiebreaker: pass nextAfterUserId from the previous response. Required when afterName is set so name-ties don&#39;t drop entries. (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<PageUsersOnlineResponse>> getOnlineUsers(
         utility::string_t tenantId,
-        utility::string_t urlId,
-        boost::optional<utility::string_t> afterName,
-        boost::optional<utility::string_t> afterUserId
+        utility::string_t urlId
+        
+        , const GetOnlineUsersOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -572,12 +715,9 @@ class  PublicApi
     /// <param name="sortBy">Sort order. &#x60;updatedAt&#x60; (default, newest first), &#x60;commentCount&#x60; (most comments first), or &#x60;title&#x60; (alphabetical). (optional, default to new PagesSortBy())</param>
     /// <param name="hasComments">If true, only return pages with at least one comment. (optional, default to false)</param>
     pplx::task<std::shared_ptr<GetPublicPagesResponse>> getPagesPublic(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> cursor,
-        boost::optional<int32_t> limit,
-        boost::optional<utility::string_t> q,
-        boost::optional<std::shared_ptr<PagesSortBy>> sortBy,
-        boost::optional<bool> hasComments
+        utility::string_t tenantId
+        
+        , const GetPagesPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -591,9 +731,9 @@ class  PublicApi
     /// <param name="useFullTranslationIds"> (optional, default to false)</param>
     pplx::task<std::shared_ptr<GetTranslationsResponse>> getTranslations(
         utility::string_t r_namespace,
-        utility::string_t component,
-        boost::optional<utility::string_t> locale,
-        boost::optional<bool> useFullTranslationIds
+        utility::string_t component
+        
+        , const GetTranslationsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -604,8 +744,8 @@ class  PublicApi
     /// <param name="tenantId"></param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetUserNotificationCountResponse>> getUserNotificationCount(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -626,18 +766,9 @@ class  PublicApi
     /// <param name="includeTenantNotifications"> (optional, default to false)</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<GetMyNotificationsResponse>> getUserNotifications(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> urlId,
-        boost::optional<int32_t> pageSize,
-        boost::optional<utility::string_t> afterId,
-        boost::optional<bool> includeContext,
-        boost::optional<int64_t> afterCreatedAt,
-        boost::optional<bool> unreadOnly,
-        boost::optional<bool> dmOnly,
-        boost::optional<bool> noDm,
-        boost::optional<bool> includeTranslations,
-        boost::optional<bool> includeTenantNotifications,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetUserNotificationsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -652,6 +783,7 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t urlIdWS,
         utility::string_t userIds
+        
     ) const;
     /// <summary>
     /// 
@@ -663,9 +795,9 @@ class  PublicApi
     /// <param name="postIds"> (optional, default to std::vector&lt;std::shared_ptr&lt;utility::string_t&gt;&gt;())</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<UserReactsResponse>> getUserReactsPublic(
-        utility::string_t tenantId,
-        boost::optional<std::vector<utility::string_t>> postIds,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const GetUserReactsPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -678,6 +810,7 @@ class  PublicApi
     pplx::task<std::shared_ptr<PageUsersInfoResponse>> getUsersInfo(
         utility::string_t tenantId,
         utility::string_t ids
+        
     ) const;
     /// <summary>
     /// 
@@ -690,6 +823,7 @@ class  PublicApi
     pplx::task<std::shared_ptr<GetV1PageLikes>> getV1PageLikes(
         utility::string_t tenantId,
         utility::string_t urlId
+        
     ) const;
     /// <summary>
     /// 
@@ -704,6 +838,7 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t urlId,
         utility::string_t id
+        
     ) const;
     /// <summary>
     /// 
@@ -716,6 +851,7 @@ class  PublicApi
     pplx::task<std::shared_ptr<GetV2PageReacts>> getV2PageReacts(
         utility::string_t tenantId,
         utility::string_t urlId
+        
     ) const;
     /// <summary>
     /// 
@@ -730,8 +866,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> lockComment(
         utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t broadcastId,
-        boost::optional<utility::string_t> sso
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -740,6 +876,7 @@ class  PublicApi
     /// 
     /// </remarks>
     pplx::task<std::shared_ptr<APIEmptyResponse>> logoutPublic(
+        
     ) const;
     /// <summary>
     /// 
@@ -754,8 +891,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> pinComment(
         utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t broadcastId,
-        boost::optional<utility::string_t> sso
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -772,10 +909,9 @@ class  PublicApi
     pplx::task<std::shared_ptr<ReactFeedPostResponse>> reactFeedPostPublic(
         utility::string_t tenantId,
         utility::string_t postId,
-        std::shared_ptr<ReactBodyParams> reactBodyParams,
-        boost::optional<bool> isUndo,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<ReactBodyParams> reactBodyParams
+        
+        , const ReactFeedPostPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -786,8 +922,8 @@ class  PublicApi
     /// <param name="tenantId"></param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> resetUserNotificationCount(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -803,13 +939,9 @@ class  PublicApi
     /// <param name="noDm"> (optional, default to false)</param>
     /// <param name="sso"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> resetUserNotifications(
-        utility::string_t tenantId,
-        boost::optional<utility::string_t> afterId,
-        boost::optional<int64_t> afterCreatedAt,
-        boost::optional<bool> unreadOnly,
-        boost::optional<bool> dmOnly,
-        boost::optional<bool> noDm,
-        boost::optional<utility::string_t> sso
+        utility::string_t tenantId
+        
+        , const ResetUserNotificationsOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -825,11 +957,9 @@ class  PublicApi
     /// <param name="searchSection"> (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<SearchUsersResult>> searchUsers(
         utility::string_t tenantId,
-        utility::string_t urlId,
-        boost::optional<utility::string_t> usernameStartsWith,
-        boost::optional<std::vector<utility::string_t>> mentionGroupIds,
-        boost::optional<utility::string_t> sso,
-        boost::optional<utility::string_t> searchSection
+        utility::string_t urlId
+        
+        , const SearchUsersOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -847,9 +977,9 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t commentId,
         utility::string_t broadcastId,
-        std::shared_ptr<CommentTextUpdateRequest> commentTextUpdateRequest,
-        boost::optional<utility::string_t> editKey,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<CommentTextUpdateRequest> commentTextUpdateRequest
+        
+        , const SetCommentTextOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -864,8 +994,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<UnblockSuccess>> unBlockCommentPublic(
         utility::string_t tenantId,
         utility::string_t commentId,
-        std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -880,8 +1010,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<APIEmptyResponse>> unLockComment(
         utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t broadcastId,
-        boost::optional<utility::string_t> sso
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -896,8 +1026,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> unPinComment(
         utility::string_t tenantId,
         utility::string_t commentId,
-        utility::string_t broadcastId,
-        boost::optional<utility::string_t> sso
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -913,9 +1043,9 @@ class  PublicApi
     pplx::task<std::shared_ptr<CreateFeedPostResponse>> updateFeedPostPublic(
         utility::string_t tenantId,
         utility::string_t postId,
-        std::shared_ptr<UpdateFeedPostParams> updateFeedPostParams,
-        boost::optional<utility::string_t> broadcastId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<UpdateFeedPostParams> updateFeedPostParams
+        
+        , const UpdateFeedPostPublicOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -932,8 +1062,8 @@ class  PublicApi
         utility::string_t tenantId,
         utility::string_t notificationId,
         utility::string_t optedInOrOut,
-        utility::string_t commentId,
-        boost::optional<utility::string_t> sso
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -952,8 +1082,8 @@ class  PublicApi
         utility::string_t urlId,
         utility::string_t url,
         utility::string_t pageTitle,
-        utility::string_t subscribedOrUnsubscribed,
-        boost::optional<utility::string_t> sso
+        utility::string_t subscribedOrUnsubscribed
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -968,8 +1098,8 @@ class  PublicApi
     pplx::task<std::shared_ptr<UpdateUserNotificationStatusResponse>> updateUserNotificationStatus(
         utility::string_t tenantId,
         utility::string_t notificationId,
-        utility::string_t newStatus,
-        boost::optional<utility::string_t> sso
+        utility::string_t newStatus
+        , boost::optional<utility::string_t> sso = boost::none
     ) const;
     /// <summary>
     /// 
@@ -983,9 +1113,9 @@ class  PublicApi
     /// <param name="urlId">Page id that upload is happening from, to configure (optional, default to utility::conversions::to_string_t(&quot;&quot;))</param>
     pplx::task<std::shared_ptr<UploadImageResponse>> uploadImage(
         utility::string_t tenantId,
-        std::shared_ptr<HttpContent> file,
-        boost::optional<std::shared_ptr<SizePreset>> sizePreset,
-        boost::optional<utility::string_t> urlId
+        std::shared_ptr<HttpContent> file
+        
+        , const UploadImageOptions& options = {}
     ) const;
     /// <summary>
     /// 
@@ -1005,9 +1135,9 @@ class  PublicApi
         utility::string_t commentId,
         utility::string_t urlId,
         utility::string_t broadcastId,
-        std::shared_ptr<VoteBodyParams> voteBodyParams,
-        boost::optional<utility::string_t> sessionId,
-        boost::optional<utility::string_t> sso
+        std::shared_ptr<VoteBodyParams> voteBodyParams
+        
+        , const VoteCommentOptions& options = {}
     ) const;
 
 protected:
diff --git a/client/include/FastCommentsClient/model/PostRemoveCommentResponse.h b/client/include/FastCommentsClient/model/PostRemoveCommentApiResponse.h
similarity index 80%
rename from client/include/FastCommentsClient/model/PostRemoveCommentResponse.h
rename to client/include/FastCommentsClient/model/PostRemoveCommentApiResponse.h
index 6f2d51c..af47bd8 100644
--- a/client/include/FastCommentsClient/model/PostRemoveCommentResponse.h
+++ b/client/include/FastCommentsClient/model/PostRemoveCommentApiResponse.h
@@ -10,13 +10,13 @@
  */
 
 /*
- * PostRemoveCommentResponse.h
+ * PostRemoveCommentApiResponse.h
  *
  * 
  */
 
-#ifndef ORG_OPENAPITOOLS_CLIENT_MODEL_PostRemoveCommentResponse_H_
-#define ORG_OPENAPITOOLS_CLIENT_MODEL_PostRemoveCommentResponse_H_
+#ifndef ORG_OPENAPITOOLS_CLIENT_MODEL_PostRemoveCommentApiResponse_H_
+#define ORG_OPENAPITOOLS_CLIENT_MODEL_PostRemoveCommentApiResponse_H_
 
 #include <boost/optional.hpp>
 
@@ -33,12 +33,12 @@ namespace model {
 
 
 
-class  PostRemoveCommentResponse
+class  PostRemoveCommentApiResponse
     : public ModelBase
 {
 public:
-    PostRemoveCommentResponse();
-    virtual ~PostRemoveCommentResponse();
+    PostRemoveCommentApiResponse();
+    virtual ~PostRemoveCommentApiResponse();
 
     /////////////////////////////////////////////
     /// ModelBase overrides
@@ -53,7 +53,7 @@ class  PostRemoveCommentResponse
 
 
     /////////////////////////////////////////////
-    /// PostRemoveCommentResponse members
+    /// PostRemoveCommentApiResponse members
 
 
     utility::string_t getAction() const;
@@ -82,4 +82,4 @@ class  PostRemoveCommentResponse
 }
 }
 
-#endif /* ORG_OPENAPITOOLS_CLIENT_MODEL_PostRemoveCommentResponse_H_ */
+#endif /* ORG_OPENAPITOOLS_CLIENT_MODEL_PostRemoveCommentApiResponse_H_ */
diff --git a/client/src/api/DefaultApi.cpp b/client/src/api/DefaultApi.cpp
index 561388f..b494177 100644
--- a/client/src/api/DefaultApi.cpp
+++ b/client/src/api/DefaultApi.cpp
@@ -35,7 +35,11 @@ DefaultApi::~DefaultApi()
 {
 }
 
-pplx::task<std::shared_ptr<AddDomainConfigResponse>> DefaultApi::addDomainConfig(utility::string_t tenantId, std::shared_ptr<AddDomainConfigParams> addDomainConfigParams) const
+pplx::task<std::shared_ptr<AddDomainConfigResponse>> DefaultApi::addDomainConfig(
+        utility::string_t tenantId,
+        std::shared_ptr<AddDomainConfigParams> addDomainConfigParams
+        
+) const
 {
 
     // verify the required parameter 'addDomainConfigParams' is set
@@ -97,7 +101,6 @@ pplx::task<std::shared_ptr<AddDomainConfigResponse>> DefaultApi::addDomainConfig
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(addDomainConfigParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -191,7 +194,11 @@ pplx::task<std::shared_ptr<AddDomainConfigResponse>> DefaultApi::addDomainConfig
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateHashTagResponse>> DefaultApi::addHashTag(boost::optional<utility::string_t> tenantId, boost::optional<std::shared_ptr<CreateHashTagBody>> createHashTagBody) const
+pplx::task<std::shared_ptr<CreateHashTagResponse>> DefaultApi::addHashTag(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateHashTagBody> createHashTagBody
+        
+) const
 {
 
 
@@ -233,9 +240,8 @@ pplx::task<std::shared_ptr<CreateHashTagResponse>> DefaultApi::addHashTag(boost:
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
 
     std::shared_ptr<IHttpBody> localVarHttpBody;
@@ -247,8 +253,7 @@ pplx::task<std::shared_ptr<CreateHashTagResponse>> DefaultApi::addHashTag(boost:
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        if (createHashTagBody)
-            localVarJson = ModelBase::toJson(*createHashTagBody);
+        localVarJson = ModelBase::toJson(createHashTagBody);
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -258,9 +263,9 @@ pplx::task<std::shared_ptr<CreateHashTagResponse>> DefaultApi::addHashTag(boost:
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(createHashTagBody && (*createHashTagBody).get())
+        if(createHashTagBody.get())
         {
-            (*createHashTagBody)->toMultipart(localVarMultipart, utility::conversions::to_string_t("createHashTagBody"));
+            createHashTagBody->toMultipart(localVarMultipart, utility::conversions::to_string_t("createHashTagBody"));
         }
         
 
@@ -342,7 +347,11 @@ pplx::task<std::shared_ptr<CreateHashTagResponse>> DefaultApi::addHashTag(boost:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> DefaultApi::addHashTagsBulk(boost::optional<utility::string_t> tenantId, boost::optional<std::shared_ptr<BulkCreateHashTagsBody>> bulkCreateHashTagsBody) const
+pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> DefaultApi::addHashTagsBulk(
+        utility::string_t tenantId,
+        std::shared_ptr<BulkCreateHashTagsBody> bulkCreateHashTagsBody
+        
+) const
 {
 
 
@@ -384,9 +393,8 @@ pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> DefaultApi::addHashTagsB
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
 
     std::shared_ptr<IHttpBody> localVarHttpBody;
@@ -398,8 +406,7 @@ pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> DefaultApi::addHashTagsB
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        if (bulkCreateHashTagsBody)
-            localVarJson = ModelBase::toJson(*bulkCreateHashTagsBody);
+        localVarJson = ModelBase::toJson(bulkCreateHashTagsBody);
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -409,9 +416,9 @@ pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> DefaultApi::addHashTagsB
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(bulkCreateHashTagsBody && (*bulkCreateHashTagsBody).get())
+        if(bulkCreateHashTagsBody.get())
         {
-            (*bulkCreateHashTagsBody)->toMultipart(localVarMultipart, utility::conversions::to_string_t("bulkCreateHashTagsBody"));
+            bulkCreateHashTagsBody->toMultipart(localVarMultipart, utility::conversions::to_string_t("bulkCreateHashTagsBody"));
         }
         
 
@@ -493,7 +500,11 @@ pplx::task<std::shared_ptr<BulkCreateHashTagsResponse>> DefaultApi::addHashTagsB
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<AddPageAPIResponse>> DefaultApi::addPage(utility::string_t tenantId, std::shared_ptr<CreateAPIPageData> createAPIPageData) const
+pplx::task<std::shared_ptr<AddPageAPIResponse>> DefaultApi::addPage(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateAPIPageData> createAPIPageData
+        
+) const
 {
 
     // verify the required parameter 'createAPIPageData' is set
@@ -555,7 +566,6 @@ pplx::task<std::shared_ptr<AddPageAPIResponse>> DefaultApi::addPage(utility::str
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createAPIPageData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -649,7 +659,11 @@ pplx::task<std::shared_ptr<AddPageAPIResponse>> DefaultApi::addPage(utility::str
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<AddSSOUserAPIResponse>> DefaultApi::addSSOUser(utility::string_t tenantId, std::shared_ptr<CreateAPISSOUserData> createAPISSOUserData) const
+pplx::task<std::shared_ptr<AddSSOUserAPIResponse>> DefaultApi::addSSOUser(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateAPISSOUserData> createAPISSOUserData
+        
+) const
 {
 
     // verify the required parameter 'createAPISSOUserData' is set
@@ -711,7 +725,6 @@ pplx::task<std::shared_ptr<AddSSOUserAPIResponse>> DefaultApi::addSSOUser(utilit
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createAPISSOUserData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -805,8 +818,15 @@ pplx::task<std::shared_ptr<AddSSOUserAPIResponse>> DefaultApi::addSSOUser(utilit
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<AggregateResponse>> DefaultApi::aggregate(utility::string_t tenantId, std::shared_ptr<AggregationRequest> aggregationRequest, boost::optional<utility::string_t> parentTenantId, boost::optional<bool> includeStats) const
+pplx::task<std::shared_ptr<AggregateResponse>> DefaultApi::aggregate(
+        utility::string_t tenantId,
+        std::shared_ptr<AggregationRequest> aggregationRequest
+        
+        , const AggregateOptions& options
+) const
 {
+    auto parentTenantId = options.parentTenantId;
+    auto includeStats = options.includeStats;
 
     // verify the required parameter 'aggregationRequest' is set
     if (aggregationRequest == nullptr)
@@ -875,7 +895,6 @@ pplx::task<std::shared_ptr<AggregateResponse>> DefaultApi::aggregate(utility::st
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(aggregationRequest);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -969,8 +988,18 @@ pplx::task<std::shared_ptr<AggregateResponse>> DefaultApi::aggregate(utility::st
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<AggregateQuestionResultsResponse>> DefaultApi::aggregateQuestionResults(utility::string_t tenantId, boost::optional<utility::string_t> questionId, boost::optional<std::vector<utility::string_t>> questionIds, boost::optional<utility::string_t> urlId, boost::optional<std::shared_ptr<AggregateTimeBucket>> timeBucket, boost::optional<utility::datetime> startDate, boost::optional<bool> forceRecalculate) const
+pplx::task<std::shared_ptr<AggregateQuestionResultsResponse>> DefaultApi::aggregateQuestionResults(
+        utility::string_t tenantId
+        
+        , const AggregateQuestionResultsOptions& options
+) const
 {
+    auto questionId = options.questionId;
+    auto questionIds = options.questionIds;
+    auto urlId = options.urlId;
+    auto timeBucket = options.timeBucket;
+    auto startDate = options.startDate;
+    auto forceRecalculate = options.forceRecalculate;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -1126,8 +1155,16 @@ pplx::task<std::shared_ptr<AggregateQuestionResultsResponse>> DefaultApi::aggreg
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<BlockSuccess>> DefaultApi::blockUserFromComment(utility::string_t tenantId, utility::string_t id, std::shared_ptr<BlockFromCommentParams> blockFromCommentParams, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId) const
+pplx::task<std::shared_ptr<BlockSuccess>> DefaultApi::blockUserFromComment(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<BlockFromCommentParams> blockFromCommentParams
+        
+        , const BlockUserFromCommentOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
 
     // verify the required parameter 'blockFromCommentParams' is set
     if (blockFromCommentParams == nullptr)
@@ -1197,7 +1234,6 @@ pplx::task<std::shared_ptr<BlockSuccess>> DefaultApi::blockUserFromComment(utili
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(blockFromCommentParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -1291,7 +1327,11 @@ pplx::task<std::shared_ptr<BlockSuccess>> DefaultApi::blockUserFromComment(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<BulkAggregateQuestionResultsResponse>> DefaultApi::bulkAggregateQuestionResults(utility::string_t tenantId, std::shared_ptr<BulkAggregateQuestionResultsRequest> bulkAggregateQuestionResultsRequest, boost::optional<bool> forceRecalculate) const
+pplx::task<std::shared_ptr<BulkAggregateQuestionResultsResponse>> DefaultApi::bulkAggregateQuestionResults(
+        utility::string_t tenantId,
+        std::shared_ptr<BulkAggregateQuestionResultsRequest> bulkAggregateQuestionResultsRequest
+        , boost::optional<bool> forceRecalculate
+) const
 {
 
     // verify the required parameter 'bulkAggregateQuestionResultsRequest' is set
@@ -1357,7 +1397,6 @@ pplx::task<std::shared_ptr<BulkAggregateQuestionResultsResponse>> DefaultApi::bu
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(bulkAggregateQuestionResultsRequest);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -1451,7 +1490,13 @@ pplx::task<std::shared_ptr<BulkAggregateQuestionResultsResponse>> DefaultApi::bu
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ChangeTicketStateResponse>> DefaultApi::changeTicketState(utility::string_t tenantId, utility::string_t userId, utility::string_t id, std::shared_ptr<ChangeTicketStateBody> changeTicketStateBody) const
+pplx::task<std::shared_ptr<ChangeTicketStateResponse>> DefaultApi::changeTicketState(
+        utility::string_t tenantId,
+        utility::string_t userId,
+        utility::string_t id,
+        std::shared_ptr<ChangeTicketStateBody> changeTicketStateBody
+        
+) const
 {
 
     // verify the required parameter 'changeTicketStateBody' is set
@@ -1517,7 +1562,6 @@ pplx::task<std::shared_ptr<ChangeTicketStateResponse>> DefaultApi::changeTicketS
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(changeTicketStateBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -1611,8 +1655,20 @@ pplx::task<std::shared_ptr<ChangeTicketStateResponse>> DefaultApi::changeTicketS
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CombineQuestionResultsWithCommentsResponse>> DefaultApi::combineCommentsWithQuestionResults(utility::string_t tenantId, boost::optional<utility::string_t> questionId, boost::optional<std::vector<utility::string_t>> questionIds, boost::optional<utility::string_t> urlId, boost::optional<utility::datetime> startDate, boost::optional<bool> forceRecalculate, boost::optional<double> minValue, boost::optional<double> maxValue, boost::optional<double> limit) const
+pplx::task<std::shared_ptr<CombineQuestionResultsWithCommentsResponse>> DefaultApi::combineCommentsWithQuestionResults(
+        utility::string_t tenantId
+        
+        , const CombineCommentsWithQuestionResultsOptions& options
+) const
 {
+    auto questionId = options.questionId;
+    auto questionIds = options.questionIds;
+    auto urlId = options.urlId;
+    auto startDate = options.startDate;
+    auto forceRecalculate = options.forceRecalculate;
+    auto minValue = options.minValue;
+    auto maxValue = options.maxValue;
+    auto limit = options.limit;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -1776,7 +1832,11 @@ pplx::task<std::shared_ptr<CombineQuestionResultsWithCommentsResponse>> DefaultA
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateEmailTemplateResponse>> DefaultApi::createEmailTemplate(utility::string_t tenantId, std::shared_ptr<CreateEmailTemplateBody> createEmailTemplateBody) const
+pplx::task<std::shared_ptr<CreateEmailTemplateResponse>> DefaultApi::createEmailTemplate(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateEmailTemplateBody> createEmailTemplateBody
+        
+) const
 {
 
     // verify the required parameter 'createEmailTemplateBody' is set
@@ -1838,7 +1898,6 @@ pplx::task<std::shared_ptr<CreateEmailTemplateResponse>> DefaultApi::createEmail
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createEmailTemplateBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -1932,8 +1991,17 @@ pplx::task<std::shared_ptr<CreateEmailTemplateResponse>> DefaultApi::createEmail
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateFeedPostsResponse>> DefaultApi::createFeedPost(utility::string_t tenantId, std::shared_ptr<CreateFeedPostParams> createFeedPostParams, boost::optional<utility::string_t> broadcastId, boost::optional<bool> isLive, boost::optional<bool> doSpamCheck, boost::optional<bool> skipDupCheck) const
+pplx::task<std::shared_ptr<CreateFeedPostsResponse>> DefaultApi::createFeedPost(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateFeedPostParams> createFeedPostParams
+        
+        , const CreateFeedPostOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto isLive = options.isLive;
+    auto doSpamCheck = options.doSpamCheck;
+    auto skipDupCheck = options.skipDupCheck;
 
     // verify the required parameter 'createFeedPostParams' is set
     if (createFeedPostParams == nullptr)
@@ -2010,7 +2078,6 @@ pplx::task<std::shared_ptr<CreateFeedPostsResponse>> DefaultApi::createFeedPost(
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createFeedPostParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -2104,7 +2171,11 @@ pplx::task<std::shared_ptr<CreateFeedPostsResponse>> DefaultApi::createFeedPost(
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateModeratorResponse>> DefaultApi::createModerator(utility::string_t tenantId, std::shared_ptr<CreateModeratorBody> createModeratorBody) const
+pplx::task<std::shared_ptr<CreateModeratorResponse>> DefaultApi::createModerator(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateModeratorBody> createModeratorBody
+        
+) const
 {
 
     // verify the required parameter 'createModeratorBody' is set
@@ -2166,7 +2237,6 @@ pplx::task<std::shared_ptr<CreateModeratorResponse>> DefaultApi::createModerator
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createModeratorBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -2260,7 +2330,11 @@ pplx::task<std::shared_ptr<CreateModeratorResponse>> DefaultApi::createModerator
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateQuestionConfigResponse>> DefaultApi::createQuestionConfig(utility::string_t tenantId, std::shared_ptr<CreateQuestionConfigBody> createQuestionConfigBody) const
+pplx::task<std::shared_ptr<CreateQuestionConfigResponse>> DefaultApi::createQuestionConfig(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateQuestionConfigBody> createQuestionConfigBody
+        
+) const
 {
 
     // verify the required parameter 'createQuestionConfigBody' is set
@@ -2322,7 +2396,6 @@ pplx::task<std::shared_ptr<CreateQuestionConfigResponse>> DefaultApi::createQues
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createQuestionConfigBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -2416,7 +2489,11 @@ pplx::task<std::shared_ptr<CreateQuestionConfigResponse>> DefaultApi::createQues
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateQuestionResultResponse>> DefaultApi::createQuestionResult(utility::string_t tenantId, std::shared_ptr<CreateQuestionResultBody> createQuestionResultBody) const
+pplx::task<std::shared_ptr<CreateQuestionResultResponse>> DefaultApi::createQuestionResult(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateQuestionResultBody> createQuestionResultBody
+        
+) const
 {
 
     // verify the required parameter 'createQuestionResultBody' is set
@@ -2478,7 +2555,6 @@ pplx::task<std::shared_ptr<CreateQuestionResultResponse>> DefaultApi::createQues
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createQuestionResultBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -2572,7 +2648,11 @@ pplx::task<std::shared_ptr<CreateQuestionResultResponse>> DefaultApi::createQues
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateSubscriptionAPIResponse>> DefaultApi::createSubscription(utility::string_t tenantId, std::shared_ptr<CreateAPIUserSubscriptionData> createAPIUserSubscriptionData) const
+pplx::task<std::shared_ptr<CreateSubscriptionAPIResponse>> DefaultApi::createSubscription(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateAPIUserSubscriptionData> createAPIUserSubscriptionData
+        
+) const
 {
 
     // verify the required parameter 'createAPIUserSubscriptionData' is set
@@ -2634,7 +2714,6 @@ pplx::task<std::shared_ptr<CreateSubscriptionAPIResponse>> DefaultApi::createSub
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createAPIUserSubscriptionData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -2728,7 +2807,11 @@ pplx::task<std::shared_ptr<CreateSubscriptionAPIResponse>> DefaultApi::createSub
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateTenantResponse>> DefaultApi::createTenant(utility::string_t tenantId, std::shared_ptr<CreateTenantBody> createTenantBody) const
+pplx::task<std::shared_ptr<CreateTenantResponse>> DefaultApi::createTenant(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateTenantBody> createTenantBody
+        
+) const
 {
 
     // verify the required parameter 'createTenantBody' is set
@@ -2790,7 +2873,6 @@ pplx::task<std::shared_ptr<CreateTenantResponse>> DefaultApi::createTenant(utili
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createTenantBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -2884,7 +2966,11 @@ pplx::task<std::shared_ptr<CreateTenantResponse>> DefaultApi::createTenant(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateTenantPackageResponse>> DefaultApi::createTenantPackage(utility::string_t tenantId, std::shared_ptr<CreateTenantPackageBody> createTenantPackageBody) const
+pplx::task<std::shared_ptr<CreateTenantPackageResponse>> DefaultApi::createTenantPackage(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateTenantPackageBody> createTenantPackageBody
+        
+) const
 {
 
     // verify the required parameter 'createTenantPackageBody' is set
@@ -2946,7 +3032,6 @@ pplx::task<std::shared_ptr<CreateTenantPackageResponse>> DefaultApi::createTenan
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createTenantPackageBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3040,7 +3125,11 @@ pplx::task<std::shared_ptr<CreateTenantPackageResponse>> DefaultApi::createTenan
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateTenantUserResponse>> DefaultApi::createTenantUser(utility::string_t tenantId, std::shared_ptr<CreateTenantUserBody> createTenantUserBody) const
+pplx::task<std::shared_ptr<CreateTenantUserResponse>> DefaultApi::createTenantUser(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateTenantUserBody> createTenantUserBody
+        
+) const
 {
 
     // verify the required parameter 'createTenantUserBody' is set
@@ -3102,7 +3191,6 @@ pplx::task<std::shared_ptr<CreateTenantUserResponse>> DefaultApi::createTenantUs
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createTenantUserBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3196,7 +3284,12 @@ pplx::task<std::shared_ptr<CreateTenantUserResponse>> DefaultApi::createTenantUs
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateTicketResponse>> DefaultApi::createTicket(utility::string_t tenantId, utility::string_t userId, std::shared_ptr<CreateTicketBody> createTicketBody) const
+pplx::task<std::shared_ptr<CreateTicketResponse>> DefaultApi::createTicket(
+        utility::string_t tenantId,
+        utility::string_t userId,
+        std::shared_ptr<CreateTicketBody> createTicketBody
+        
+) const
 {
 
     // verify the required parameter 'createTicketBody' is set
@@ -3261,7 +3354,6 @@ pplx::task<std::shared_ptr<CreateTicketResponse>> DefaultApi::createTicket(utili
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createTicketBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3355,7 +3447,11 @@ pplx::task<std::shared_ptr<CreateTicketResponse>> DefaultApi::createTicket(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APICreateUserBadgeResponse>> DefaultApi::createUserBadge(utility::string_t tenantId, std::shared_ptr<CreateUserBadgeParams> createUserBadgeParams) const
+pplx::task<std::shared_ptr<APICreateUserBadgeResponse>> DefaultApi::createUserBadge(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateUserBadgeParams> createUserBadgeParams
+        
+) const
 {
 
     // verify the required parameter 'createUserBadgeParams' is set
@@ -3417,7 +3513,6 @@ pplx::task<std::shared_ptr<APICreateUserBadgeResponse>> DefaultApi::createUserBa
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createUserBadgeParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3511,8 +3606,16 @@ pplx::task<std::shared_ptr<APICreateUserBadgeResponse>> DefaultApi::createUserBa
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<VoteResponse>> DefaultApi::createVote(utility::string_t tenantId, utility::string_t commentId, utility::string_t direction, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId) const
+pplx::task<std::shared_ptr<VoteResponse>> DefaultApi::createVote(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t direction
+        
+        , const CreateVoteOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3658,8 +3761,15 @@ pplx::task<std::shared_ptr<VoteResponse>> DefaultApi::createVote(utility::string
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<DeleteCommentResult>> DefaultApi::deleteComment(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> contextUserId, boost::optional<bool> isLive) const
+pplx::task<std::shared_ptr<DeleteCommentResult>> DefaultApi::deleteComment(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+        , const DeleteCommentOptions& options
+) const
 {
+    auto contextUserId = options.contextUserId;
+    auto isLive = options.isLive;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3800,7 +3910,11 @@ pplx::task<std::shared_ptr<DeleteCommentResult>> DefaultApi::deleteComment(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<DeleteDomainConfigResponse>> DefaultApi::deleteDomainConfig(utility::string_t tenantId, utility::string_t domain) const
+pplx::task<std::shared_ptr<DeleteDomainConfigResponse>> DefaultApi::deleteDomainConfig(
+        utility::string_t tenantId,
+        utility::string_t domain
+        
+) const
 {
 
 
@@ -3934,7 +4048,11 @@ pplx::task<std::shared_ptr<DeleteDomainConfigResponse>> DefaultApi::deleteDomain
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteEmailTemplate(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteEmailTemplate(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -4068,7 +4186,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteEmailTemplate(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteEmailTemplateRenderError(utility::string_t tenantId, utility::string_t id, utility::string_t errorId) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteEmailTemplateRenderError(
+        utility::string_t tenantId,
+        utility::string_t id,
+        utility::string_t errorId
+        
+) const
 {
 
 
@@ -4203,7 +4326,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteEmailTemplateRen
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteHashTag(utility::string_t tag, boost::optional<utility::string_t> tenantId, boost::optional<std::shared_ptr<DeleteHashTagRequestBody>> deleteHashTagRequestBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteHashTag(
+        utility::string_t tenantId,
+        utility::string_t tag,
+        std::shared_ptr<DeleteHashTagRequestBody> deleteHashTagRequestBody
+        
+) const
 {
 
 
@@ -4246,9 +4374,8 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteHashTag(utility:
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
 
     std::shared_ptr<IHttpBody> localVarHttpBody;
@@ -4260,8 +4387,7 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteHashTag(utility:
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        if (deleteHashTagRequestBody)
-            localVarJson = ModelBase::toJson(*deleteHashTagRequestBody);
+        localVarJson = ModelBase::toJson(deleteHashTagRequestBody);
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -4271,9 +4397,9 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteHashTag(utility:
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(deleteHashTagRequestBody && (*deleteHashTagRequestBody).get())
+        if(deleteHashTagRequestBody.get())
         {
-            (*deleteHashTagRequestBody)->toMultipart(localVarMultipart, utility::conversions::to_string_t("deleteHashTagRequestBody"));
+            deleteHashTagRequestBody->toMultipart(localVarMultipart, utility::conversions::to_string_t("deleteHashTagRequestBody"));
         }
         
 
@@ -4355,7 +4481,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteHashTag(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteModerator(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> sendEmail) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteModerator(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<utility::string_t> sendEmail
+) const
 {
 
 
@@ -4493,7 +4623,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteModerator(utilit
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteNotificationCount(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteNotificationCount(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -4627,7 +4761,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteNotificationCoun
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<DeletePageAPIResponse>> DefaultApi::deletePage(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<DeletePageAPIResponse>> DefaultApi::deletePage(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -4761,7 +4899,11 @@ pplx::task<std::shared_ptr<DeletePageAPIResponse>> DefaultApi::deletePage(utilit
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deletePendingWebhookEvent(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deletePendingWebhookEvent(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -4895,7 +5037,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deletePendingWebhookEv
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteQuestionConfig(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteQuestionConfig(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -5029,7 +5175,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteQuestionConfig(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteQuestionResult(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteQuestionResult(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -5163,8 +5313,15 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteQuestionResult(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<DeleteSSOUserAPIResponse>> DefaultApi::deleteSSOUser(utility::string_t tenantId, utility::string_t id, boost::optional<bool> deleteComments, boost::optional<utility::string_t> commentDeleteMode) const
+pplx::task<std::shared_ptr<DeleteSSOUserAPIResponse>> DefaultApi::deleteSSOUser(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+        , const DeleteSSOUserOptions& options
+) const
 {
+    auto deleteComments = options.deleteComments;
+    auto commentDeleteMode = options.commentDeleteMode;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -5305,7 +5462,11 @@ pplx::task<std::shared_ptr<DeleteSSOUserAPIResponse>> DefaultApi::deleteSSOUser(
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<DeleteSubscriptionAPIResponse>> DefaultApi::deleteSubscription(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> userId) const
+pplx::task<std::shared_ptr<DeleteSubscriptionAPIResponse>> DefaultApi::deleteSubscription(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<utility::string_t> userId
+) const
 {
 
 
@@ -5443,7 +5604,11 @@ pplx::task<std::shared_ptr<DeleteSubscriptionAPIResponse>> DefaultApi::deleteSub
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenant(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> sure) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenant(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<utility::string_t> sure
+) const
 {
 
 
@@ -5581,7 +5746,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenant(utility::
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenantPackage(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenantPackage(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -5715,8 +5884,15 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenantPackage(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenantUser(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> deleteComments, boost::optional<utility::string_t> commentDeleteMode) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenantUser(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+        , const DeleteTenantUserOptions& options
+) const
 {
+    auto deleteComments = options.deleteComments;
+    auto commentDeleteMode = options.commentDeleteMode;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -5857,7 +6033,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::deleteTenantUser(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptySuccessResponse>> DefaultApi::deleteUserBadge(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIEmptySuccessResponse>> DefaultApi::deleteUserBadge(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -5991,7 +6171,11 @@ pplx::task<std::shared_ptr<APIEmptySuccessResponse>> DefaultApi::deleteUserBadge
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<VoteDeleteResponse>> DefaultApi::deleteVote(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> editKey) const
+pplx::task<std::shared_ptr<VoteDeleteResponse>> DefaultApi::deleteVote(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<utility::string_t> editKey
+) const
 {
 
 
@@ -6129,8 +6313,15 @@ pplx::task<std::shared_ptr<VoteDeleteResponse>> DefaultApi::deleteVote(utility::
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<FlagCommentResponse>> DefaultApi::flagComment(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId) const
+pplx::task<std::shared_ptr<FlagCommentResponse>> DefaultApi::flagComment(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+        , const FlagCommentOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -6271,8 +6462,17 @@ pplx::task<std::shared_ptr<FlagCommentResponse>> DefaultApi::flagComment(utility
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetAuditLogsResponse>> DefaultApi::getAuditLogs(utility::string_t tenantId, boost::optional<double> limit, boost::optional<double> skip, boost::optional<std::shared_ptr<SORT_DIR>> order, boost::optional<double> after, boost::optional<double> before) const
+pplx::task<std::shared_ptr<GetAuditLogsResponse>> DefaultApi::getAuditLogs(
+        utility::string_t tenantId
+        
+        , const GetAuditLogsOptions& options
+) const
 {
+    auto limit = options.limit;
+    auto skip = options.skip;
+    auto order = options.order;
+    auto after = options.after;
+    auto before = options.before;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -6424,7 +6624,11 @@ pplx::task<std::shared_ptr<GetAuditLogsResponse>> DefaultApi::getAuditLogs(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetCachedNotificationCountResponse>> DefaultApi::getCachedNotificationCount(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetCachedNotificationCountResponse>> DefaultApi::getCachedNotificationCount(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -6558,7 +6762,11 @@ pplx::task<std::shared_ptr<GetCachedNotificationCountResponse>> DefaultApi::getC
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetCommentResponse>> DefaultApi::getComment(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIGetCommentResponse>> DefaultApi::getComment(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -6692,8 +6900,28 @@ pplx::task<std::shared_ptr<APIGetCommentResponse>> DefaultApi::getComment(utilit
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetCommentsResponse>> DefaultApi::getComments(utility::string_t tenantId, boost::optional<int32_t> page, boost::optional<int32_t> limit, boost::optional<int32_t> skip, boost::optional<bool> asTree, boost::optional<int32_t> skipChildren, boost::optional<int32_t> limitChildren, boost::optional<int32_t> maxTreeDepth, boost::optional<utility::string_t> urlId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId, boost::optional<utility::string_t> contextUserId, boost::optional<utility::string_t> hashTag, boost::optional<utility::string_t> parentId, boost::optional<std::shared_ptr<SortDirections>> direction, boost::optional<int64_t> fromDate, boost::optional<int64_t> toDate) const
+pplx::task<std::shared_ptr<APIGetCommentsResponse>> DefaultApi::getComments(
+        utility::string_t tenantId
+        
+        , const GetCommentsOptions& options
+) const
 {
+    auto page = options.page;
+    auto limit = options.limit;
+    auto skip = options.skip;
+    auto asTree = options.asTree;
+    auto skipChildren = options.skipChildren;
+    auto limitChildren = options.limitChildren;
+    auto maxTreeDepth = options.maxTreeDepth;
+    auto urlId = options.urlId;
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
+    auto contextUserId = options.contextUserId;
+    auto hashTag = options.hashTag;
+    auto parentId = options.parentId;
+    auto direction = options.direction;
+    auto fromDate = options.fromDate;
+    auto toDate = options.toDate;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -6889,7 +7117,11 @@ pplx::task<std::shared_ptr<APIGetCommentsResponse>> DefaultApi::getComments(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetDomainConfigResponse>> DefaultApi::getDomainConfig(utility::string_t tenantId, utility::string_t domain) const
+pplx::task<std::shared_ptr<GetDomainConfigResponse>> DefaultApi::getDomainConfig(
+        utility::string_t tenantId,
+        utility::string_t domain
+        
+) const
 {
 
 
@@ -7023,7 +7255,10 @@ pplx::task<std::shared_ptr<GetDomainConfigResponse>> DefaultApi::getDomainConfig
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetDomainConfigsResponse>> DefaultApi::getDomainConfigs(utility::string_t tenantId) const
+pplx::task<std::shared_ptr<GetDomainConfigsResponse>> DefaultApi::getDomainConfigs(
+        utility::string_t tenantId
+        
+) const
 {
 
 
@@ -7156,7 +7391,11 @@ pplx::task<std::shared_ptr<GetDomainConfigsResponse>> DefaultApi::getDomainConfi
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetEmailTemplateResponse>> DefaultApi::getEmailTemplate(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetEmailTemplateResponse>> DefaultApi::getEmailTemplate(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -7290,7 +7529,10 @@ pplx::task<std::shared_ptr<GetEmailTemplateResponse>> DefaultApi::getEmailTempla
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetEmailTemplateDefinitionsResponse>> DefaultApi::getEmailTemplateDefinitions(utility::string_t tenantId) const
+pplx::task<std::shared_ptr<GetEmailTemplateDefinitionsResponse>> DefaultApi::getEmailTemplateDefinitions(
+        utility::string_t tenantId
+        
+) const
 {
 
 
@@ -7423,7 +7665,11 @@ pplx::task<std::shared_ptr<GetEmailTemplateDefinitionsResponse>> DefaultApi::get
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetEmailTemplateRenderErrorsResponse>> DefaultApi::getEmailTemplateRenderErrors(utility::string_t tenantId, utility::string_t id, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetEmailTemplateRenderErrorsResponse>> DefaultApi::getEmailTemplateRenderErrors(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<double> skip
+) const
 {
 
 
@@ -7561,7 +7807,10 @@ pplx::task<std::shared_ptr<GetEmailTemplateRenderErrorsResponse>> DefaultApi::ge
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetEmailTemplatesResponse>> DefaultApi::getEmailTemplates(utility::string_t tenantId, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetEmailTemplatesResponse>> DefaultApi::getEmailTemplates(
+        utility::string_t tenantId
+        , boost::optional<double> skip
+) const
 {
 
 
@@ -7698,8 +7947,15 @@ pplx::task<std::shared_ptr<GetEmailTemplatesResponse>> DefaultApi::getEmailTempl
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetFeedPostsResponse>> DefaultApi::getFeedPosts(utility::string_t tenantId, boost::optional<utility::string_t> afterId, boost::optional<int32_t> limit, boost::optional<std::vector<utility::string_t>> tags) const
+pplx::task<std::shared_ptr<GetFeedPostsResponse>> DefaultApi::getFeedPosts(
+        utility::string_t tenantId
+        
+        , const GetFeedPostsOptions& options
+) const
 {
+    auto afterId = options.afterId;
+    auto limit = options.limit;
+    auto tags = options.tags;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -7843,7 +8099,10 @@ pplx::task<std::shared_ptr<GetFeedPostsResponse>> DefaultApi::getFeedPosts(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetHashTagsResponse>> DefaultApi::getHashTags(utility::string_t tenantId, boost::optional<double> page) const
+pplx::task<std::shared_ptr<GetHashTagsResponse>> DefaultApi::getHashTags(
+        utility::string_t tenantId
+        , boost::optional<double> page
+) const
 {
 
 
@@ -7980,7 +8239,11 @@ pplx::task<std::shared_ptr<GetHashTagsResponse>> DefaultApi::getHashTags(utility
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetModeratorResponse>> DefaultApi::getModerator(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetModeratorResponse>> DefaultApi::getModerator(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -8114,7 +8377,10 @@ pplx::task<std::shared_ptr<GetModeratorResponse>> DefaultApi::getModerator(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetModeratorsResponse>> DefaultApi::getModerators(utility::string_t tenantId, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetModeratorsResponse>> DefaultApi::getModerators(
+        utility::string_t tenantId
+        , boost::optional<double> skip
+) const
 {
 
 
@@ -8251,8 +8517,17 @@ pplx::task<std::shared_ptr<GetModeratorsResponse>> DefaultApi::getModerators(uti
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetNotificationCountResponse>> DefaultApi::getNotificationCount(utility::string_t tenantId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> urlId, boost::optional<utility::string_t> fromCommentId, boost::optional<bool> viewed, boost::optional<utility::string_t> type) const
+pplx::task<std::shared_ptr<GetNotificationCountResponse>> DefaultApi::getNotificationCount(
+        utility::string_t tenantId
+        
+        , const GetNotificationCountOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto urlId = options.urlId;
+    auto fromCommentId = options.fromCommentId;
+    auto viewed = options.viewed;
+    auto type = options.type;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -8404,8 +8679,18 @@ pplx::task<std::shared_ptr<GetNotificationCountResponse>> DefaultApi::getNotific
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetNotificationsResponse>> DefaultApi::getNotifications(utility::string_t tenantId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> urlId, boost::optional<utility::string_t> fromCommentId, boost::optional<bool> viewed, boost::optional<utility::string_t> type, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetNotificationsResponse>> DefaultApi::getNotifications(
+        utility::string_t tenantId
+        
+        , const GetNotificationsOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto urlId = options.urlId;
+    auto fromCommentId = options.fromCommentId;
+    auto viewed = options.viewed;
+    auto type = options.type;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -8561,7 +8846,11 @@ pplx::task<std::shared_ptr<GetNotificationsResponse>> DefaultApi::getNotificatio
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetPageByURLIdAPIResponse>> DefaultApi::getPageByURLId(utility::string_t tenantId, utility::string_t urlId) const
+pplx::task<std::shared_ptr<GetPageByURLIdAPIResponse>> DefaultApi::getPageByURLId(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+) const
 {
 
 
@@ -8697,7 +8986,10 @@ pplx::task<std::shared_ptr<GetPageByURLIdAPIResponse>> DefaultApi::getPageByURLI
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetPagesAPIResponse>> DefaultApi::getPages(utility::string_t tenantId) const
+pplx::task<std::shared_ptr<GetPagesAPIResponse>> DefaultApi::getPages(
+        utility::string_t tenantId
+        
+) const
 {
 
 
@@ -8830,8 +9122,18 @@ pplx::task<std::shared_ptr<GetPagesAPIResponse>> DefaultApi::getPages(utility::s
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetPendingWebhookEventCountResponse>> DefaultApi::getPendingWebhookEventCount(utility::string_t tenantId, boost::optional<utility::string_t> commentId, boost::optional<utility::string_t> externalId, boost::optional<utility::string_t> eventType, boost::optional<utility::string_t> type, boost::optional<utility::string_t> domain, boost::optional<double> attemptCountGT) const
+pplx::task<std::shared_ptr<GetPendingWebhookEventCountResponse>> DefaultApi::getPendingWebhookEventCount(
+        utility::string_t tenantId
+        
+        , const GetPendingWebhookEventCountOptions& options
+) const
 {
+    auto commentId = options.commentId;
+    auto externalId = options.externalId;
+    auto eventType = options.eventType;
+    auto type = options.type;
+    auto domain = options.domain;
+    auto attemptCountGT = options.attemptCountGT;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -8987,8 +9289,19 @@ pplx::task<std::shared_ptr<GetPendingWebhookEventCountResponse>> DefaultApi::get
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetPendingWebhookEventsResponse>> DefaultApi::getPendingWebhookEvents(utility::string_t tenantId, boost::optional<utility::string_t> commentId, boost::optional<utility::string_t> externalId, boost::optional<utility::string_t> eventType, boost::optional<utility::string_t> type, boost::optional<utility::string_t> domain, boost::optional<double> attemptCountGT, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetPendingWebhookEventsResponse>> DefaultApi::getPendingWebhookEvents(
+        utility::string_t tenantId
+        
+        , const GetPendingWebhookEventsOptions& options
+) const
 {
+    auto commentId = options.commentId;
+    auto externalId = options.externalId;
+    auto eventType = options.eventType;
+    auto type = options.type;
+    auto domain = options.domain;
+    auto attemptCountGT = options.attemptCountGT;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -9148,7 +9461,11 @@ pplx::task<std::shared_ptr<GetPendingWebhookEventsResponse>> DefaultApi::getPend
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetQuestionConfigResponse>> DefaultApi::getQuestionConfig(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetQuestionConfigResponse>> DefaultApi::getQuestionConfig(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -9282,7 +9599,10 @@ pplx::task<std::shared_ptr<GetQuestionConfigResponse>> DefaultApi::getQuestionCo
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetQuestionConfigsResponse>> DefaultApi::getQuestionConfigs(utility::string_t tenantId, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetQuestionConfigsResponse>> DefaultApi::getQuestionConfigs(
+        utility::string_t tenantId
+        , boost::optional<double> skip
+) const
 {
 
 
@@ -9419,7 +9739,11 @@ pplx::task<std::shared_ptr<GetQuestionConfigsResponse>> DefaultApi::getQuestionC
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetQuestionResultResponse>> DefaultApi::getQuestionResult(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetQuestionResultResponse>> DefaultApi::getQuestionResult(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -9553,8 +9877,18 @@ pplx::task<std::shared_ptr<GetQuestionResultResponse>> DefaultApi::getQuestionRe
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetQuestionResultsResponse>> DefaultApi::getQuestionResults(utility::string_t tenantId, boost::optional<utility::string_t> urlId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> startDate, boost::optional<utility::string_t> questionId, boost::optional<utility::string_t> questionIds, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetQuestionResultsResponse>> DefaultApi::getQuestionResults(
+        utility::string_t tenantId
+        
+        , const GetQuestionResultsOptions& options
+) const
 {
+    auto urlId = options.urlId;
+    auto userId = options.userId;
+    auto startDate = options.startDate;
+    auto questionId = options.questionId;
+    auto questionIds = options.questionIds;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -9710,7 +10044,11 @@ pplx::task<std::shared_ptr<GetQuestionResultsResponse>> DefaultApi::getQuestionR
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetSSOUserByEmailAPIResponse>> DefaultApi::getSSOUserByEmail(utility::string_t tenantId, utility::string_t email) const
+pplx::task<std::shared_ptr<GetSSOUserByEmailAPIResponse>> DefaultApi::getSSOUserByEmail(
+        utility::string_t tenantId,
+        utility::string_t email
+        
+) const
 {
 
 
@@ -9844,7 +10182,11 @@ pplx::task<std::shared_ptr<GetSSOUserByEmailAPIResponse>> DefaultApi::getSSOUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetSSOUserByIdAPIResponse>> DefaultApi::getSSOUserById(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetSSOUserByIdAPIResponse>> DefaultApi::getSSOUserById(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -9978,7 +10320,10 @@ pplx::task<std::shared_ptr<GetSSOUserByIdAPIResponse>> DefaultApi::getSSOUserByI
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetSSOUsersResponse>> DefaultApi::getSSOUsers(utility::string_t tenantId, boost::optional<int32_t> skip) const
+pplx::task<std::shared_ptr<GetSSOUsersResponse>> DefaultApi::getSSOUsers(
+        utility::string_t tenantId
+        , boost::optional<int32_t> skip
+) const
 {
 
 
@@ -10115,7 +10460,10 @@ pplx::task<std::shared_ptr<GetSSOUsersResponse>> DefaultApi::getSSOUsers(utility
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetSubscriptionsAPIResponse>> DefaultApi::getSubscriptions(utility::string_t tenantId, boost::optional<utility::string_t> userId) const
+pplx::task<std::shared_ptr<GetSubscriptionsAPIResponse>> DefaultApi::getSubscriptions(
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> userId
+) const
 {
 
 
@@ -10252,7 +10600,11 @@ pplx::task<std::shared_ptr<GetSubscriptionsAPIResponse>> DefaultApi::getSubscrip
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantResponse>> DefaultApi::getTenant(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetTenantResponse>> DefaultApi::getTenant(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -10386,8 +10738,16 @@ pplx::task<std::shared_ptr<GetTenantResponse>> DefaultApi::getTenant(utility::st
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantDailyUsagesResponse>> DefaultApi::getTenantDailyUsages(utility::string_t tenantId, boost::optional<double> yearNumber, boost::optional<double> monthNumber, boost::optional<double> dayNumber, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetTenantDailyUsagesResponse>> DefaultApi::getTenantDailyUsages(
+        utility::string_t tenantId
+        
+        , const GetTenantDailyUsagesOptions& options
+) const
 {
+    auto yearNumber = options.yearNumber;
+    auto monthNumber = options.monthNumber;
+    auto dayNumber = options.dayNumber;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -10535,7 +10895,11 @@ pplx::task<std::shared_ptr<GetTenantDailyUsagesResponse>> DefaultApi::getTenantD
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantPackageResponse>> DefaultApi::getTenantPackage(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetTenantPackageResponse>> DefaultApi::getTenantPackage(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -10669,7 +11033,10 @@ pplx::task<std::shared_ptr<GetTenantPackageResponse>> DefaultApi::getTenantPacka
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantPackagesResponse>> DefaultApi::getTenantPackages(utility::string_t tenantId, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetTenantPackagesResponse>> DefaultApi::getTenantPackages(
+        utility::string_t tenantId
+        , boost::optional<double> skip
+) const
 {
 
 
@@ -10806,7 +11173,11 @@ pplx::task<std::shared_ptr<GetTenantPackagesResponse>> DefaultApi::getTenantPack
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantUserResponse>> DefaultApi::getTenantUser(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetTenantUserResponse>> DefaultApi::getTenantUser(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -10940,7 +11311,10 @@ pplx::task<std::shared_ptr<GetTenantUserResponse>> DefaultApi::getTenantUser(uti
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantUsersResponse>> DefaultApi::getTenantUsers(utility::string_t tenantId, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetTenantUsersResponse>> DefaultApi::getTenantUsers(
+        utility::string_t tenantId
+        , boost::optional<double> skip
+) const
 {
 
 
@@ -11077,8 +11451,14 @@ pplx::task<std::shared_ptr<GetTenantUsersResponse>> DefaultApi::getTenantUsers(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantsResponse>> DefaultApi::getTenants(utility::string_t tenantId, boost::optional<utility::string_t> meta, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<GetTenantsResponse>> DefaultApi::getTenants(
+        utility::string_t tenantId
+        
+        , const GetTenantsOptions& options
+) const
 {
+    auto meta = options.meta;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -11218,7 +11598,11 @@ pplx::task<std::shared_ptr<GetTenantsResponse>> DefaultApi::getTenants(utility::
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTicketResponse>> DefaultApi::getTicket(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> userId) const
+pplx::task<std::shared_ptr<GetTicketResponse>> DefaultApi::getTicket(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<utility::string_t> userId
+) const
 {
 
 
@@ -11356,8 +11740,16 @@ pplx::task<std::shared_ptr<GetTicketResponse>> DefaultApi::getTicket(utility::st
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTicketsResponse>> DefaultApi::getTickets(utility::string_t tenantId, boost::optional<utility::string_t> userId, boost::optional<double> state, boost::optional<double> skip, boost::optional<double> limit) const
+pplx::task<std::shared_ptr<GetTicketsResponse>> DefaultApi::getTickets(
+        utility::string_t tenantId
+        
+        , const GetTicketsOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto state = options.state;
+    auto skip = options.skip;
+    auto limit = options.limit;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -11505,7 +11897,11 @@ pplx::task<std::shared_ptr<GetTicketsResponse>> DefaultApi::getTickets(utility::
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetUserResponse>> DefaultApi::getUser(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetUserResponse>> DefaultApi::getUser(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -11639,7 +12035,11 @@ pplx::task<std::shared_ptr<GetUserResponse>> DefaultApi::getUser(utility::string
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetUserBadgeResponse>> DefaultApi::getUserBadge(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIGetUserBadgeResponse>> DefaultApi::getUserBadge(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -11773,7 +12173,11 @@ pplx::task<std::shared_ptr<APIGetUserBadgeResponse>> DefaultApi::getUserBadge(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> DefaultApi::getUserBadgeProgressById(utility::string_t tenantId, utility::string_t id) const
+pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> DefaultApi::getUserBadgeProgressById(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -11907,7 +12311,11 @@ pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> DefaultApi::getUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> DefaultApi::getUserBadgeProgressByUserId(utility::string_t tenantId, utility::string_t userId) const
+pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> DefaultApi::getUserBadgeProgressByUserId(
+        utility::string_t tenantId,
+        utility::string_t userId
+        
+) const
 {
 
 
@@ -12041,8 +12449,15 @@ pplx::task<std::shared_ptr<APIGetUserBadgeProgressResponse>> DefaultApi::getUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetUserBadgeProgressListResponse>> DefaultApi::getUserBadgeProgressList(utility::string_t tenantId, boost::optional<utility::string_t> userId, boost::optional<double> limit, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<APIGetUserBadgeProgressListResponse>> DefaultApi::getUserBadgeProgressList(
+        utility::string_t tenantId
+        
+        , const GetUserBadgeProgressListOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto limit = options.limit;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -12186,8 +12601,18 @@ pplx::task<std::shared_ptr<APIGetUserBadgeProgressListResponse>> DefaultApi::get
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIGetUserBadgesResponse>> DefaultApi::getUserBadges(utility::string_t tenantId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> badgeId, boost::optional<double> type, boost::optional<bool> displayedOnComments, boost::optional<double> limit, boost::optional<double> skip) const
+pplx::task<std::shared_ptr<APIGetUserBadgesResponse>> DefaultApi::getUserBadges(
+        utility::string_t tenantId
+        
+        , const GetUserBadgesOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto badgeId = options.badgeId;
+    auto type = options.type;
+    auto displayedOnComments = options.displayedOnComments;
+    auto limit = options.limit;
+    auto skip = options.skip;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -12343,7 +12768,11 @@ pplx::task<std::shared_ptr<APIGetUserBadgesResponse>> DefaultApi::getUserBadges(
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetVotesResponse>> DefaultApi::getVotes(utility::string_t tenantId, utility::string_t urlId) const
+pplx::task<std::shared_ptr<GetVotesResponse>> DefaultApi::getVotes(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+) const
 {
 
 
@@ -12479,8 +12908,15 @@ pplx::task<std::shared_ptr<GetVotesResponse>> DefaultApi::getVotes(utility::stri
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetVotesForUserResponse>> DefaultApi::getVotesForUser(utility::string_t tenantId, utility::string_t urlId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId) const
+pplx::task<std::shared_ptr<GetVotesForUserResponse>> DefaultApi::getVotesForUser(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+        , const GetVotesForUserOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -12623,7 +13059,12 @@ pplx::task<std::shared_ptr<GetVotesForUserResponse>> DefaultApi::getVotesForUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PatchDomainConfigResponse>> DefaultApi::patchDomainConfig(utility::string_t tenantId, utility::string_t domainToUpdate, std::shared_ptr<PatchDomainConfigParams> patchDomainConfigParams) const
+pplx::task<std::shared_ptr<PatchDomainConfigResponse>> DefaultApi::patchDomainConfig(
+        utility::string_t tenantId,
+        utility::string_t domainToUpdate,
+        std::shared_ptr<PatchDomainConfigParams> patchDomainConfigParams
+        
+) const
 {
 
     // verify the required parameter 'patchDomainConfigParams' is set
@@ -12686,7 +13127,6 @@ pplx::task<std::shared_ptr<PatchDomainConfigResponse>> DefaultApi::patchDomainCo
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(patchDomainConfigParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -12780,7 +13220,12 @@ pplx::task<std::shared_ptr<PatchDomainConfigResponse>> DefaultApi::patchDomainCo
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UpdateHashTagResponse>> DefaultApi::patchHashTag(utility::string_t tag, boost::optional<utility::string_t> tenantId, boost::optional<std::shared_ptr<UpdateHashTagBody>> updateHashTagBody) const
+pplx::task<std::shared_ptr<UpdateHashTagResponse>> DefaultApi::patchHashTag(
+        utility::string_t tenantId,
+        utility::string_t tag,
+        std::shared_ptr<UpdateHashTagBody> updateHashTagBody
+        
+) const
 {
 
 
@@ -12823,9 +13268,8 @@ pplx::task<std::shared_ptr<UpdateHashTagResponse>> DefaultApi::patchHashTag(util
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
 
     std::shared_ptr<IHttpBody> localVarHttpBody;
@@ -12837,8 +13281,7 @@ pplx::task<std::shared_ptr<UpdateHashTagResponse>> DefaultApi::patchHashTag(util
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        if (updateHashTagBody)
-            localVarJson = ModelBase::toJson(*updateHashTagBody);
+        localVarJson = ModelBase::toJson(updateHashTagBody);
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -12848,9 +13291,9 @@ pplx::task<std::shared_ptr<UpdateHashTagResponse>> DefaultApi::patchHashTag(util
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(updateHashTagBody && (*updateHashTagBody).get())
+        if(updateHashTagBody.get())
         {
-            (*updateHashTagBody)->toMultipart(localVarMultipart, utility::conversions::to_string_t("updateHashTagBody"));
+            updateHashTagBody->toMultipart(localVarMultipart, utility::conversions::to_string_t("updateHashTagBody"));
         }
         
 
@@ -12932,7 +13375,12 @@ pplx::task<std::shared_ptr<UpdateHashTagResponse>> DefaultApi::patchHashTag(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PatchPageAPIResponse>> DefaultApi::patchPage(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateAPIPageData> updateAPIPageData) const
+pplx::task<std::shared_ptr<PatchPageAPIResponse>> DefaultApi::patchPage(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateAPIPageData> updateAPIPageData
+        
+) const
 {
 
     // verify the required parameter 'updateAPIPageData' is set
@@ -12995,7 +13443,6 @@ pplx::task<std::shared_ptr<PatchPageAPIResponse>> DefaultApi::patchPage(utility:
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateAPIPageData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -13089,7 +13536,12 @@ pplx::task<std::shared_ptr<PatchPageAPIResponse>> DefaultApi::patchPage(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PatchSSOUserAPIResponse>> DefaultApi::patchSSOUser(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData, boost::optional<bool> updateComments) const
+pplx::task<std::shared_ptr<PatchSSOUserAPIResponse>> DefaultApi::patchSSOUser(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData
+        , boost::optional<bool> updateComments
+) const
 {
 
     // verify the required parameter 'updateAPISSOUserData' is set
@@ -13156,7 +13608,6 @@ pplx::task<std::shared_ptr<PatchSSOUserAPIResponse>> DefaultApi::patchSSOUser(ut
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateAPISSOUserData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -13250,7 +13701,12 @@ pplx::task<std::shared_ptr<PatchSSOUserAPIResponse>> DefaultApi::patchSSOUser(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PutDomainConfigResponse>> DefaultApi::putDomainConfig(utility::string_t tenantId, utility::string_t domainToUpdate, std::shared_ptr<UpdateDomainConfigParams> updateDomainConfigParams) const
+pplx::task<std::shared_ptr<PutDomainConfigResponse>> DefaultApi::putDomainConfig(
+        utility::string_t tenantId,
+        utility::string_t domainToUpdate,
+        std::shared_ptr<UpdateDomainConfigParams> updateDomainConfigParams
+        
+) const
 {
 
     // verify the required parameter 'updateDomainConfigParams' is set
@@ -13313,7 +13769,6 @@ pplx::task<std::shared_ptr<PutDomainConfigResponse>> DefaultApi::putDomainConfig
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateDomainConfigParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -13407,7 +13862,12 @@ pplx::task<std::shared_ptr<PutDomainConfigResponse>> DefaultApi::putDomainConfig
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PutSSOUserAPIResponse>> DefaultApi::putSSOUser(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData, boost::optional<bool> updateComments) const
+pplx::task<std::shared_ptr<PutSSOUserAPIResponse>> DefaultApi::putSSOUser(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateAPISSOUserData> updateAPISSOUserData
+        , boost::optional<bool> updateComments
+) const
 {
 
     // verify the required parameter 'updateAPISSOUserData' is set
@@ -13474,7 +13934,6 @@ pplx::task<std::shared_ptr<PutSSOUserAPIResponse>> DefaultApi::putSSOUser(utilit
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateAPISSOUserData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -13568,7 +14027,11 @@ pplx::task<std::shared_ptr<PutSSOUserAPIResponse>> DefaultApi::putSSOUser(utilit
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<RenderEmailTemplateResponse>> DefaultApi::renderEmailTemplate(utility::string_t tenantId, std::shared_ptr<RenderEmailTemplateBody> renderEmailTemplateBody, boost::optional<utility::string_t> locale) const
+pplx::task<std::shared_ptr<RenderEmailTemplateResponse>> DefaultApi::renderEmailTemplate(
+        utility::string_t tenantId,
+        std::shared_ptr<RenderEmailTemplateBody> renderEmailTemplateBody
+        , boost::optional<utility::string_t> locale
+) const
 {
 
     // verify the required parameter 'renderEmailTemplateBody' is set
@@ -13634,7 +14097,6 @@ pplx::task<std::shared_ptr<RenderEmailTemplateResponse>> DefaultApi::renderEmail
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(renderEmailTemplateBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -13728,7 +14190,12 @@ pplx::task<std::shared_ptr<RenderEmailTemplateResponse>> DefaultApi::renderEmail
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantPackage(utility::string_t tenantId, utility::string_t id, std::shared_ptr<ReplaceTenantPackageBody> replaceTenantPackageBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantPackage(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<ReplaceTenantPackageBody> replaceTenantPackageBody
+        
+) const
 {
 
     // verify the required parameter 'replaceTenantPackageBody' is set
@@ -13791,7 +14258,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantPackage(u
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(replaceTenantPackageBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -13885,7 +14351,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantPackage(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantUser(utility::string_t tenantId, utility::string_t id, std::shared_ptr<ReplaceTenantUserBody> replaceTenantUserBody, boost::optional<utility::string_t> updateComments) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantUser(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<ReplaceTenantUserBody> replaceTenantUserBody
+        , boost::optional<utility::string_t> updateComments
+) const
 {
 
     // verify the required parameter 'replaceTenantUserBody' is set
@@ -13952,7 +14423,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantUser(util
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(replaceTenantUserBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -14046,8 +14516,17 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::replaceTenantUser(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APISaveCommentResponse>> DefaultApi::saveComment(utility::string_t tenantId, std::shared_ptr<CreateCommentParams> createCommentParams, boost::optional<bool> isLive, boost::optional<bool> doSpamCheck, boost::optional<bool> sendEmails, boost::optional<bool> populateNotifications) const
+pplx::task<std::shared_ptr<APISaveCommentResponse>> DefaultApi::saveComment(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateCommentParams> createCommentParams
+        
+        , const SaveCommentOptions& options
+) const
 {
+    auto isLive = options.isLive;
+    auto doSpamCheck = options.doSpamCheck;
+    auto sendEmails = options.sendEmails;
+    auto populateNotifications = options.populateNotifications;
 
     // verify the required parameter 'createCommentParams' is set
     if (createCommentParams == nullptr)
@@ -14124,7 +14603,6 @@ pplx::task<std::shared_ptr<APISaveCommentResponse>> DefaultApi::saveComment(util
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createCommentParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -14218,8 +14696,17 @@ pplx::task<std::shared_ptr<APISaveCommentResponse>> DefaultApi::saveComment(util
         return localVarResult;
     });
 }
-pplx::task<std::vector<std::shared_ptr<SaveCommentsBulkResponse>>> DefaultApi::saveCommentsBulk(utility::string_t tenantId, std::vector<std::shared_ptr<CreateCommentParams>> createCommentParams, boost::optional<bool> isLive, boost::optional<bool> doSpamCheck, boost::optional<bool> sendEmails, boost::optional<bool> populateNotifications) const
+pplx::task<std::vector<std::shared_ptr<SaveCommentsBulkResponse>>> DefaultApi::saveCommentsBulk(
+        utility::string_t tenantId,
+        std::vector<std::shared_ptr<CreateCommentParams>> createCommentParams
+        
+        , const SaveCommentsBulkOptions& options
+) const
 {
+    auto isLive = options.isLive;
+    auto doSpamCheck = options.doSpamCheck;
+    auto sendEmails = options.sendEmails;
+    auto populateNotifications = options.populateNotifications;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -14399,7 +14886,12 @@ pplx::task<std::vector<std::shared_ptr<SaveCommentsBulkResponse>>> DefaultApi::s
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::sendInvite(utility::string_t tenantId, utility::string_t id, utility::string_t fromName) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::sendInvite(
+        utility::string_t tenantId,
+        utility::string_t id,
+        utility::string_t fromName
+        
+) const
 {
 
 
@@ -14536,7 +15028,11 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::sendInvite(utility::st
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::sendLoginLink(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> redirectURL) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::sendLoginLink(
+        utility::string_t tenantId,
+        utility::string_t id
+        , boost::optional<utility::string_t> redirectURL
+) const
 {
 
 
@@ -14674,8 +15170,16 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::sendLoginLink(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UnblockSuccess>> DefaultApi::unBlockUserFromComment(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UnBlockFromCommentParams> unBlockFromCommentParams, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId) const
+pplx::task<std::shared_ptr<UnblockSuccess>> DefaultApi::unBlockUserFromComment(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UnBlockFromCommentParams> unBlockFromCommentParams
+        
+        , const UnBlockUserFromCommentOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
 
     // verify the required parameter 'unBlockFromCommentParams' is set
     if (unBlockFromCommentParams == nullptr)
@@ -14745,7 +15249,6 @@ pplx::task<std::shared_ptr<UnblockSuccess>> DefaultApi::unBlockUserFromComment(u
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(unBlockFromCommentParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -14839,8 +15342,15 @@ pplx::task<std::shared_ptr<UnblockSuccess>> DefaultApi::unBlockUserFromComment(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<FlagCommentResponse>> DefaultApi::unFlagComment(utility::string_t tenantId, utility::string_t id, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> anonUserId) const
+pplx::task<std::shared_ptr<FlagCommentResponse>> DefaultApi::unFlagComment(
+        utility::string_t tenantId,
+        utility::string_t id
+        
+        , const UnFlagCommentOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto anonUserId = options.anonUserId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -14981,8 +15491,17 @@ pplx::task<std::shared_ptr<FlagCommentResponse>> DefaultApi::unFlagComment(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateComment(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdatableCommentParams> updatableCommentParams, boost::optional<utility::string_t> contextUserId, boost::optional<bool> doSpamCheck, boost::optional<bool> isLive) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateComment(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdatableCommentParams> updatableCommentParams
+        
+        , const UpdateCommentOptions& options
+) const
 {
+    auto contextUserId = options.contextUserId;
+    auto doSpamCheck = options.doSpamCheck;
+    auto isLive = options.isLive;
 
     // verify the required parameter 'updatableCommentParams' is set
     if (updatableCommentParams == nullptr)
@@ -15056,7 +15575,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateComment(utility:
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updatableCommentParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -15150,7 +15668,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateComment(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateEmailTemplate(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateEmailTemplateBody> updateEmailTemplateBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateEmailTemplate(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateEmailTemplateBody> updateEmailTemplateBody
+        
+) const
 {
 
     // verify the required parameter 'updateEmailTemplateBody' is set
@@ -15213,7 +15736,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateEmailTemplate(ut
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateEmailTemplateBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -15307,7 +15829,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateEmailTemplate(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateFeedPost(utility::string_t tenantId, utility::string_t id, std::shared_ptr<FeedPost> feedPost) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateFeedPost(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<FeedPost> feedPost
+        
+) const
 {
 
     // verify the required parameter 'feedPost' is set
@@ -15370,7 +15897,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateFeedPost(utility
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(feedPost);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -15464,7 +15990,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateFeedPost(utility
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateModerator(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateModeratorBody> updateModeratorBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateModerator(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateModeratorBody> updateModeratorBody
+        
+) const
 {
 
     // verify the required parameter 'updateModeratorBody' is set
@@ -15527,7 +16058,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateModerator(utilit
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateModeratorBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -15621,7 +16151,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateModerator(utilit
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateNotification(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateNotificationBody> updateNotificationBody, boost::optional<utility::string_t> userId) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateNotification(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateNotificationBody> updateNotificationBody
+        , boost::optional<utility::string_t> userId
+) const
 {
 
     // verify the required parameter 'updateNotificationBody' is set
@@ -15688,7 +16223,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateNotification(uti
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateNotificationBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -15782,7 +16316,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateNotification(uti
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionConfig(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateQuestionConfigBody> updateQuestionConfigBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionConfig(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateQuestionConfigBody> updateQuestionConfigBody
+        
+) const
 {
 
     // verify the required parameter 'updateQuestionConfigBody' is set
@@ -15845,7 +16384,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionConfig(u
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateQuestionConfigBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -15939,7 +16477,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionConfig(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionResult(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateQuestionResultBody> updateQuestionResultBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionResult(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateQuestionResultBody> updateQuestionResultBody
+        
+) const
 {
 
     // verify the required parameter 'updateQuestionResultBody' is set
@@ -16002,7 +16545,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionResult(u
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateQuestionResultBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -16096,7 +16638,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateQuestionResult(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UpdateSubscriptionAPIResponse>> DefaultApi::updateSubscription(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateAPIUserSubscriptionData> updateAPIUserSubscriptionData, boost::optional<utility::string_t> userId) const
+pplx::task<std::shared_ptr<UpdateSubscriptionAPIResponse>> DefaultApi::updateSubscription(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateAPIUserSubscriptionData> updateAPIUserSubscriptionData
+        , boost::optional<utility::string_t> userId
+) const
 {
 
     // verify the required parameter 'updateAPIUserSubscriptionData' is set
@@ -16163,7 +16710,6 @@ pplx::task<std::shared_ptr<UpdateSubscriptionAPIResponse>> DefaultApi::updateSub
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateAPIUserSubscriptionData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -16257,7 +16803,12 @@ pplx::task<std::shared_ptr<UpdateSubscriptionAPIResponse>> DefaultApi::updateSub
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenant(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateTenantBody> updateTenantBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenant(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateTenantBody> updateTenantBody
+        
+) const
 {
 
     // verify the required parameter 'updateTenantBody' is set
@@ -16320,7 +16871,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenant(utility::
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateTenantBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -16414,7 +16964,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenant(utility::
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantPackage(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateTenantPackageBody> updateTenantPackageBody) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantPackage(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateTenantPackageBody> updateTenantPackageBody
+        
+) const
 {
 
     // verify the required parameter 'updateTenantPackageBody' is set
@@ -16477,7 +17032,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantPackage(ut
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateTenantPackageBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -16571,7 +17125,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantPackage(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantUser(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateTenantUserBody> updateTenantUserBody, boost::optional<utility::string_t> updateComments) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantUser(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateTenantUserBody> updateTenantUserBody
+        , boost::optional<utility::string_t> updateComments
+) const
 {
 
     // verify the required parameter 'updateTenantUserBody' is set
@@ -16638,7 +17197,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantUser(utili
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateTenantUserBody);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -16732,7 +17290,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> DefaultApi::updateTenantUser(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptySuccessResponse>> DefaultApi::updateUserBadge(utility::string_t tenantId, utility::string_t id, std::shared_ptr<UpdateUserBadgeParams> updateUserBadgeParams) const
+pplx::task<std::shared_ptr<APIEmptySuccessResponse>> DefaultApi::updateUserBadge(
+        utility::string_t tenantId,
+        utility::string_t id,
+        std::shared_ptr<UpdateUserBadgeParams> updateUserBadgeParams
+        
+) const
 {
 
     // verify the required parameter 'updateUserBadgeParams' is set
@@ -16795,7 +17358,6 @@ pplx::task<std::shared_ptr<APIEmptySuccessResponse>> DefaultApi::updateUserBadge
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateUserBadgeParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
diff --git a/client/src/api/ModerationApi.cpp b/client/src/api/ModerationApi.cpp
index cb1c47a..8860409 100644
--- a/client/src/api/ModerationApi.cpp
+++ b/client/src/api/ModerationApi.cpp
@@ -35,12 +35,20 @@ ModerationApi::~ModerationApi()
 {
 }
 
-pplx::task<std::shared_ptr<VoteDeleteResponse>> ModerationApi::deleteModerationVote(utility::string_t commentId, utility::string_t voteId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<VoteDeleteResponse>> ModerationApi::deleteModerationVote(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t voteId
+        
+        , const DeleteModerationVoteOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/vote/{commentId}/{voteId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("voteId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(voteId)));
 
@@ -78,13 +86,12 @@ pplx::task<std::shared_ptr<VoteDeleteResponse>> ModerationApi::deleteModerationV
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -171,12 +178,25 @@ pplx::task<std::shared_ptr<VoteDeleteResponse>> ModerationApi::deleteModerationV
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPIGetCommentsResponse>> ModerationApi::getApiComments(boost::optional<double> page, boost::optional<double> count, boost::optional<utility::string_t> textSearch, boost::optional<utility::string_t> byIPFromComment, boost::optional<utility::string_t> filters, boost::optional<utility::string_t> searchFilters, boost::optional<utility::string_t> sorts, boost::optional<bool> demo, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPIGetCommentsResponse>> ModerationApi::getApiComments(
+        utility::string_t tenantId
+        
+        , const GetApiCommentsOptions& options
+) const
 {
+    auto page = options.page;
+    auto count = options.count;
+    auto textSearch = options.textSearch;
+    auto byIPFromComment = options.byIPFromComment;
+    auto filters = options.filters;
+    auto searchFilters = options.searchFilters;
+    auto sorts = options.sorts;
+    auto demo = options.demo;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/api/comments");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/api/comments");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -212,6 +232,9 @@ pplx::task<std::shared_ptr<ModerationAPIGetCommentsResponse>> ModerationApi::get
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (page)
     {
         localVarQueryParams[utility::conversions::to_string_t("page")] = ApiClient::parameterToString(*page);
@@ -244,10 +267,6 @@ pplx::task<std::shared_ptr<ModerationAPIGetCommentsResponse>> ModerationApi::get
     {
         localVarQueryParams[utility::conversions::to_string_t("demo")] = ApiClient::parameterToString(*demo);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -333,12 +352,18 @@ pplx::task<std::shared_ptr<ModerationAPIGetCommentsResponse>> ModerationApi::get
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationExportStatusResponse>> ModerationApi::getApiExportStatus(boost::optional<utility::string_t> batchJobId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationExportStatusResponse>> ModerationApi::getApiExportStatus(
+        utility::string_t tenantId
+        
+        , const GetApiExportStatusOptions& options
+) const
 {
+    auto batchJobId = options.batchJobId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/api/export/status");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/api/export/status");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -374,13 +399,12 @@ pplx::task<std::shared_ptr<ModerationExportStatusResponse>> ModerationApi::getAp
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (batchJobId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("batchJobId")] = ApiClient::parameterToString(*batchJobId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (batchJobId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("batchJobId")] = ApiClient::parameterToString(*batchJobId);
     }
     if (sso)
     {
@@ -467,12 +491,23 @@ pplx::task<std::shared_ptr<ModerationExportStatusResponse>> ModerationApi::getAp
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPIGetCommentIdsResponse>> ModerationApi::getApiIds(boost::optional<utility::string_t> textSearch, boost::optional<utility::string_t> byIPFromComment, boost::optional<utility::string_t> filters, boost::optional<utility::string_t> searchFilters, boost::optional<utility::string_t> afterId, boost::optional<bool> demo, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPIGetCommentIdsResponse>> ModerationApi::getApiIds(
+        utility::string_t tenantId
+        
+        , const GetApiIdsOptions& options
+) const
 {
+    auto textSearch = options.textSearch;
+    auto byIPFromComment = options.byIPFromComment;
+    auto filters = options.filters;
+    auto searchFilters = options.searchFilters;
+    auto afterId = options.afterId;
+    auto demo = options.demo;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/api/ids");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/api/ids");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -508,6 +543,9 @@ pplx::task<std::shared_ptr<ModerationAPIGetCommentIdsResponse>> ModerationApi::g
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (textSearch)
     {
         localVarQueryParams[utility::conversions::to_string_t("text-search")] = ApiClient::parameterToString(*textSearch);
@@ -532,10 +570,6 @@ pplx::task<std::shared_ptr<ModerationAPIGetCommentIdsResponse>> ModerationApi::g
     {
         localVarQueryParams[utility::conversions::to_string_t("demo")] = ApiClient::parameterToString(*demo);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -621,12 +655,16 @@ pplx::task<std::shared_ptr<ModerationAPIGetCommentIdsResponse>> ModerationApi::g
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetBannedUsersFromCommentResponse>> ModerationApi::getBanUsersFromComment(utility::string_t commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetBannedUsersFromCommentResponse>> ModerationApi::getBanUsersFromComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/ban-users/from-comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -663,9 +701,8 @@ pplx::task<std::shared_ptr<GetBannedUsersFromCommentResponse>> ModerationApi::ge
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -752,12 +789,16 @@ pplx::task<std::shared_ptr<GetBannedUsersFromCommentResponse>> ModerationApi::ge
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetCommentBanStatusResponse>> ModerationApi::getCommentBanStatus(utility::string_t commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetCommentBanStatusResponse>> ModerationApi::getCommentBanStatus(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/get-comment-ban-status/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -794,9 +835,8 @@ pplx::task<std::shared_ptr<GetCommentBanStatusResponse>> ModerationApi::getComme
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -883,12 +923,16 @@ pplx::task<std::shared_ptr<GetCommentBanStatusResponse>> ModerationApi::getComme
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::getCommentChildren(utility::string_t commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::getCommentChildren(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/comment-children/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/comment-children/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -925,9 +969,8 @@ pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::g
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -1014,12 +1057,22 @@ pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::g
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPICountCommentsResponse>> ModerationApi::getCount(boost::optional<utility::string_t> textSearch, boost::optional<utility::string_t> byIPFromComment, boost::optional<utility::string_t> filter, boost::optional<utility::string_t> searchFilters, boost::optional<bool> demo, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPICountCommentsResponse>> ModerationApi::getCount(
+        utility::string_t tenantId
+        
+        , const GetCountOptions& options
+) const
 {
+    auto textSearch = options.textSearch;
+    auto byIPFromComment = options.byIPFromComment;
+    auto filter = options.filter;
+    auto searchFilters = options.searchFilters;
+    auto demo = options.demo;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/count");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/count");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -1055,6 +1108,9 @@ pplx::task<std::shared_ptr<ModerationAPICountCommentsResponse>> ModerationApi::g
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (textSearch)
     {
         localVarQueryParams[utility::conversions::to_string_t("text-search")] = ApiClient::parameterToString(*textSearch);
@@ -1075,10 +1131,6 @@ pplx::task<std::shared_ptr<ModerationAPICountCommentsResponse>> ModerationApi::g
     {
         localVarQueryParams[utility::conversions::to_string_t("demo")] = ApiClient::parameterToString(*demo);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -1164,12 +1216,15 @@ pplx::task<std::shared_ptr<ModerationAPICountCommentsResponse>> ModerationApi::g
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetBannedUsersCountResponse>> ModerationApi::getCounts(boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetBannedUsersCountResponse>> ModerationApi::getCounts(
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/banned-users/counts");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/banned-users/mod_api/counts");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -1205,9 +1260,8 @@ pplx::task<std::shared_ptr<GetBannedUsersCountResponse>> ModerationApi::getCount
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -1294,12 +1348,16 @@ pplx::task<std::shared_ptr<GetBannedUsersCountResponse>> ModerationApi::getCount
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPIGetLogsResponse>> ModerationApi::getLogs(utility::string_t commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPIGetLogsResponse>> ModerationApi::getLogs(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/logs/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/logs/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -1336,9 +1394,8 @@ pplx::task<std::shared_ptr<ModerationAPIGetLogsResponse>> ModerationApi::getLogs
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -1425,12 +1482,15 @@ pplx::task<std::shared_ptr<ModerationAPIGetLogsResponse>> ModerationApi::getLogs
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTenantManualBadgesResponse>> ModerationApi::getManualBadges(boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetTenantManualBadgesResponse>> ModerationApi::getManualBadges(
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/get-manual-badges");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/get-manual-badges");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -1466,9 +1526,8 @@ pplx::task<std::shared_ptr<GetTenantManualBadgesResponse>> ModerationApi::getMan
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -1555,12 +1614,19 @@ pplx::task<std::shared_ptr<GetTenantManualBadgesResponse>> ModerationApi::getMan
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetUserManualBadgesResponse>> ModerationApi::getManualBadgesForUser(boost::optional<utility::string_t> badgesUserId, boost::optional<utility::string_t> commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetUserManualBadgesResponse>> ModerationApi::getManualBadgesForUser(
+        utility::string_t tenantId
+        
+        , const GetManualBadgesForUserOptions& options
+) const
 {
+    auto badgesUserId = options.badgesUserId;
+    auto commentId = options.commentId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/get-manual-badges-for-user");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -1596,6 +1662,9 @@ pplx::task<std::shared_ptr<GetUserManualBadgesResponse>> ModerationApi::getManua
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (badgesUserId)
     {
         localVarQueryParams[utility::conversions::to_string_t("badgesUserId")] = ApiClient::parameterToString(*badgesUserId);
@@ -1604,10 +1673,6 @@ pplx::task<std::shared_ptr<GetUserManualBadgesResponse>> ModerationApi::getManua
     {
         localVarQueryParams[utility::conversions::to_string_t("commentId")] = ApiClient::parameterToString(*commentId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -1693,12 +1758,20 @@ pplx::task<std::shared_ptr<GetUserManualBadgesResponse>> ModerationApi::getManua
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPICommentResponse>> ModerationApi::getModerationComment(utility::string_t commentId, boost::optional<bool> includeEmail, boost::optional<bool> includeIP, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPICommentResponse>> ModerationApi::getModerationComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const GetModerationCommentOptions& options
+) const
 {
+    auto includeEmail = options.includeEmail;
+    auto includeIP = options.includeIP;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -1735,6 +1808,9 @@ pplx::task<std::shared_ptr<ModerationAPICommentResponse>> ModerationApi::getMode
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (includeEmail)
     {
         localVarQueryParams[utility::conversions::to_string_t("includeEmail")] = ApiClient::parameterToString(*includeEmail);
@@ -1743,10 +1819,6 @@ pplx::task<std::shared_ptr<ModerationAPICommentResponse>> ModerationApi::getMode
     {
         localVarQueryParams[utility::conversions::to_string_t("includeIP")] = ApiClient::parameterToString(*includeIP);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -1832,12 +1904,16 @@ pplx::task<std::shared_ptr<ModerationAPICommentResponse>> ModerationApi::getMode
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetCommentTextResponse>> ModerationApi::getModerationCommentText(utility::string_t commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetCommentTextResponse>> ModerationApi::getModerationCommentText(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/get-comment-text/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -1874,9 +1950,8 @@ pplx::task<std::shared_ptr<GetCommentTextResponse>> ModerationApi::getModeration
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -1963,12 +2038,21 @@ pplx::task<std::shared_ptr<GetCommentTextResponse>> ModerationApi::getModeration
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PreBanSummary>> ModerationApi::getPreBanSummary(utility::string_t commentId, boost::optional<bool> includeByUserIdAndEmail, boost::optional<bool> includeByIP, boost::optional<bool> includeByEmailDomain, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<PreBanSummary>> ModerationApi::getPreBanSummary(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const GetPreBanSummaryOptions& options
+) const
 {
+    auto includeByUserIdAndEmail = options.includeByUserIdAndEmail;
+    auto includeByIP = options.includeByIP;
+    auto includeByEmailDomain = options.includeByEmailDomain;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/pre-ban-summary/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -2005,6 +2089,9 @@ pplx::task<std::shared_ptr<PreBanSummary>> ModerationApi::getPreBanSummary(utili
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (includeByUserIdAndEmail)
     {
         localVarQueryParams[utility::conversions::to_string_t("includeByUserIdAndEmail")] = ApiClient::parameterToString(*includeByUserIdAndEmail);
@@ -2017,10 +2104,6 @@ pplx::task<std::shared_ptr<PreBanSummary>> ModerationApi::getPreBanSummary(utili
     {
         localVarQueryParams[utility::conversions::to_string_t("includeByEmailDomain")] = ApiClient::parameterToString(*includeByEmailDomain);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -2106,12 +2189,20 @@ pplx::task<std::shared_ptr<PreBanSummary>> ModerationApi::getPreBanSummary(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationCommentSearchResponse>> ModerationApi::getSearchCommentsSummary(boost::optional<utility::string_t> value, boost::optional<utility::string_t> filters, boost::optional<utility::string_t> searchFilters, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationCommentSearchResponse>> ModerationApi::getSearchCommentsSummary(
+        utility::string_t tenantId
+        
+        , const GetSearchCommentsSummaryOptions& options
+) const
 {
+    auto value = options.value;
+    auto filters = options.filters;
+    auto searchFilters = options.searchFilters;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/search/comments/summary");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/search/comments/summary");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2147,6 +2238,9 @@ pplx::task<std::shared_ptr<ModerationCommentSearchResponse>> ModerationApi::getS
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (value)
     {
         localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
@@ -2159,10 +2253,6 @@ pplx::task<std::shared_ptr<ModerationCommentSearchResponse>> ModerationApi::getS
     {
         localVarQueryParams[utility::conversions::to_string_t("searchFilters")] = ApiClient::parameterToString(*searchFilters);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -2248,12 +2338,18 @@ pplx::task<std::shared_ptr<ModerationCommentSearchResponse>> ModerationApi::getS
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationPageSearchResponse>> ModerationApi::getSearchPages(boost::optional<utility::string_t> value, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationPageSearchResponse>> ModerationApi::getSearchPages(
+        utility::string_t tenantId
+        
+        , const GetSearchPagesOptions& options
+) const
 {
+    auto value = options.value;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/search/pages");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/search/pages");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2289,13 +2385,12 @@ pplx::task<std::shared_ptr<ModerationPageSearchResponse>> ModerationApi::getSear
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (value)
     {
-        localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (value)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
     }
     if (sso)
     {
@@ -2382,12 +2477,18 @@ pplx::task<std::shared_ptr<ModerationPageSearchResponse>> ModerationApi::getSear
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationSiteSearchResponse>> ModerationApi::getSearchSites(boost::optional<utility::string_t> value, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationSiteSearchResponse>> ModerationApi::getSearchSites(
+        utility::string_t tenantId
+        
+        , const GetSearchSitesOptions& options
+) const
 {
+    auto value = options.value;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/search/sites");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/search/sites");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2423,13 +2524,12 @@ pplx::task<std::shared_ptr<ModerationSiteSearchResponse>> ModerationApi::getSear
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (value)
     {
-        localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (value)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
     }
     if (sso)
     {
@@ -2516,12 +2616,18 @@ pplx::task<std::shared_ptr<ModerationSiteSearchResponse>> ModerationApi::getSear
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationSuggestResponse>> ModerationApi::getSearchSuggest(boost::optional<utility::string_t> textSearch, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationSuggestResponse>> ModerationApi::getSearchSuggest(
+        utility::string_t tenantId
+        
+        , const GetSearchSuggestOptions& options
+) const
 {
+    auto textSearch = options.textSearch;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/search/suggest");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/search/suggest");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2557,13 +2663,12 @@ pplx::task<std::shared_ptr<ModerationSuggestResponse>> ModerationApi::getSearchS
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (textSearch)
     {
-        localVarQueryParams[utility::conversions::to_string_t("text-search")] = ApiClient::parameterToString(*textSearch);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (textSearch)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("text-search")] = ApiClient::parameterToString(*textSearch);
     }
     if (sso)
     {
@@ -2650,12 +2755,18 @@ pplx::task<std::shared_ptr<ModerationSuggestResponse>> ModerationApi::getSearchS
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationUserSearchResponse>> ModerationApi::getSearchUsers(boost::optional<utility::string_t> value, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationUserSearchResponse>> ModerationApi::getSearchUsers(
+        utility::string_t tenantId
+        
+        , const GetSearchUsersOptions& options
+) const
 {
+    auto value = options.value;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/search/users");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/search/users");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2691,13 +2802,12 @@ pplx::task<std::shared_ptr<ModerationUserSearchResponse>> ModerationApi::getSear
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (value)
     {
-        localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (value)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("value")] = ApiClient::parameterToString(*value);
     }
     if (sso)
     {
@@ -2784,12 +2894,18 @@ pplx::task<std::shared_ptr<ModerationUserSearchResponse>> ModerationApi::getSear
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetUserTrustFactorResponse>> ModerationApi::getTrustFactor(boost::optional<utility::string_t> userId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetUserTrustFactorResponse>> ModerationApi::getTrustFactor(
+        utility::string_t tenantId
+        
+        , const GetTrustFactorOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/get-trust-factor");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/get-trust-factor");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2825,13 +2941,12 @@ pplx::task<std::shared_ptr<GetUserTrustFactorResponse>> ModerationApi::getTrustF
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (userId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("userId")] = ApiClient::parameterToString(*userId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (userId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("userId")] = ApiClient::parameterToString(*userId);
     }
     if (sso)
     {
@@ -2918,12 +3033,15 @@ pplx::task<std::shared_ptr<GetUserTrustFactorResponse>> ModerationApi::getTrustF
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIModerateGetUserBanPreferencesResponse>> ModerationApi::getUserBanPreference(boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIModerateGetUserBanPreferencesResponse>> ModerationApi::getUserBanPreference(
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/user-ban-preference");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/user-ban-preference");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -2959,9 +3077,8 @@ pplx::task<std::shared_ptr<APIModerateGetUserBanPreferencesResponse>> Moderation
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -3048,12 +3165,18 @@ pplx::task<std::shared_ptr<APIModerateGetUserBanPreferencesResponse>> Moderation
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetUserInternalProfileResponse>> ModerationApi::getUserInternalProfile(boost::optional<utility::string_t> commentId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetUserInternalProfileResponse>> ModerationApi::getUserInternalProfile(
+        utility::string_t tenantId
+        
+        , const GetUserInternalProfileOptions& options
+) const
 {
+    auto commentId = options.commentId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/get-user-internal-profile");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/get-user-internal-profile");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -3089,13 +3212,12 @@ pplx::task<std::shared_ptr<GetUserInternalProfileResponse>> ModerationApi::getUs
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (commentId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("commentId")] = ApiClient::parameterToString(*commentId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (commentId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("commentId")] = ApiClient::parameterToString(*commentId);
     }
     if (sso)
     {
@@ -3182,8 +3304,16 @@ pplx::task<std::shared_ptr<GetUserInternalProfileResponse>> ModerationApi::getUs
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<AdjustVotesResponse>> ModerationApi::postAdjustCommentVotes(utility::string_t commentId, std::shared_ptr<AdjustCommentVotesParams> adjustCommentVotesParams, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<AdjustVotesResponse>> ModerationApi::postAdjustCommentVotes(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        std::shared_ptr<AdjustCommentVotesParams> adjustCommentVotesParams
+        
+        , const PostAdjustCommentVotesOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
     // verify the required parameter 'adjustCommentVotesParams' is set
     if (adjustCommentVotesParams == nullptr)
@@ -3193,7 +3323,7 @@ pplx::task<std::shared_ptr<AdjustVotesResponse>> ModerationApi::postAdjustCommen
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/adjust-comment-votes/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -3231,13 +3361,12 @@ pplx::task<std::shared_ptr<AdjustVotesResponse>> ModerationApi::postAdjustCommen
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -3254,7 +3383,6 @@ pplx::task<std::shared_ptr<AdjustVotesResponse>> ModerationApi::postAdjustCommen
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(adjustCommentVotesParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3340,12 +3468,22 @@ pplx::task<std::shared_ptr<AdjustVotesResponse>> ModerationApi::postAdjustCommen
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationExportResponse>> ModerationApi::postApiExport(boost::optional<utility::string_t> textSearch, boost::optional<utility::string_t> byIPFromComment, boost::optional<utility::string_t> filters, boost::optional<utility::string_t> searchFilters, boost::optional<utility::string_t> sorts, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationExportResponse>> ModerationApi::postApiExport(
+        utility::string_t tenantId
+        
+        , const PostApiExportOptions& options
+) const
 {
+    auto textSearch = options.textSearch;
+    auto byIPFromComment = options.byIPFromComment;
+    auto filters = options.filters;
+    auto searchFilters = options.searchFilters;
+    auto sorts = options.sorts;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/api/export");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/api/export");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -3381,6 +3519,9 @@ pplx::task<std::shared_ptr<ModerationExportResponse>> ModerationApi::postApiExpo
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (textSearch)
     {
         localVarQueryParams[utility::conversions::to_string_t("text-search")] = ApiClient::parameterToString(*textSearch);
@@ -3401,10 +3542,6 @@ pplx::task<std::shared_ptr<ModerationExportResponse>> ModerationApi::postApiExpo
     {
         localVarQueryParams[utility::conversions::to_string_t("sorts")] = ApiClient::parameterToString(*sorts);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -3490,12 +3627,26 @@ pplx::task<std::shared_ptr<ModerationExportResponse>> ModerationApi::postApiExpo
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<BanUserFromCommentResult>> ModerationApi::postBanUserFromComment(utility::string_t commentId, boost::optional<bool> banEmail, boost::optional<bool> banEmailDomain, boost::optional<bool> banIP, boost::optional<bool> deleteAllUsersComments, boost::optional<utility::string_t> bannedUntil, boost::optional<bool> isShadowBan, boost::optional<utility::string_t> updateId, boost::optional<utility::string_t> banReason, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<BanUserFromCommentResult>> ModerationApi::postBanUserFromComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostBanUserFromCommentOptions& options
+) const
 {
+    auto banEmail = options.banEmail;
+    auto banEmailDomain = options.banEmailDomain;
+    auto banIP = options.banIP;
+    auto deleteAllUsersComments = options.deleteAllUsersComments;
+    auto bannedUntil = options.bannedUntil;
+    auto isShadowBan = options.isShadowBan;
+    auto updateId = options.updateId;
+    auto banReason = options.banReason;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/ban-user/from-comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -3532,6 +3683,9 @@ pplx::task<std::shared_ptr<BanUserFromCommentResult>> ModerationApi::postBanUser
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (banEmail)
     {
         localVarQueryParams[utility::conversions::to_string_t("banEmail")] = ApiClient::parameterToString(*banEmail);
@@ -3564,10 +3718,6 @@ pplx::task<std::shared_ptr<BanUserFromCommentResult>> ModerationApi::postBanUser
     {
         localVarQueryParams[utility::conversions::to_string_t("banReason")] = ApiClient::parameterToString(*banReason);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -3653,7 +3803,11 @@ pplx::task<std::shared_ptr<BanUserFromCommentResult>> ModerationApi::postBanUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postBanUserUndo(std::shared_ptr<BanUserUndoParams> banUserUndoParams, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postBanUserUndo(
+        utility::string_t tenantId,
+        std::shared_ptr<BanUserUndoParams> banUserUndoParams
+        , boost::optional<utility::string_t> sso
+) const
 {
 
     // verify the required parameter 'banUserUndoParams' is set
@@ -3664,7 +3818,7 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postBanUserUndo(std
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/ban-user/undo");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/ban-user/undo");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -3701,9 +3855,8 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postBanUserUndo(std
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -3720,7 +3873,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postBanUserUndo(std
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(banUserUndoParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3806,8 +3958,17 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postBanUserUndo(std
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSummary(std::shared_ptr<BulkPreBanParams> bulkPreBanParams, boost::optional<bool> includeByUserIdAndEmail, boost::optional<bool> includeByIP, boost::optional<bool> includeByEmailDomain, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSummary(
+        utility::string_t tenantId,
+        std::shared_ptr<BulkPreBanParams> bulkPreBanParams
+        
+        , const PostBulkPreBanSummaryOptions& options
+) const
 {
+    auto includeByUserIdAndEmail = options.includeByUserIdAndEmail;
+    auto includeByIP = options.includeByIP;
+    auto includeByEmailDomain = options.includeByEmailDomain;
+    auto sso = options.sso;
 
     // verify the required parameter 'bulkPreBanParams' is set
     if (bulkPreBanParams == nullptr)
@@ -3817,7 +3978,7 @@ pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSumm
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/bulk-pre-ban-summary");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -3854,6 +4015,9 @@ pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSumm
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (includeByUserIdAndEmail)
     {
         localVarQueryParams[utility::conversions::to_string_t("includeByUserIdAndEmail")] = ApiClient::parameterToString(*includeByUserIdAndEmail);
@@ -3866,10 +4030,6 @@ pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSumm
     {
         localVarQueryParams[utility::conversions::to_string_t("includeByEmailDomain")] = ApiClient::parameterToString(*includeByEmailDomain);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -3885,7 +4045,6 @@ pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSumm
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(bulkPreBanParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -3971,7 +4130,11 @@ pplx::task<std::shared_ptr<BulkPreBanSummary>> ModerationApi::postBulkPreBanSumm
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::postCommentsByIds(std::shared_ptr<CommentsByIdsParams> commentsByIdsParams, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::postCommentsByIds(
+        utility::string_t tenantId,
+        std::shared_ptr<CommentsByIdsParams> commentsByIdsParams
+        , boost::optional<utility::string_t> sso
+) const
 {
 
     // verify the required parameter 'commentsByIdsParams' is set
@@ -3982,7 +4145,7 @@ pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::p
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/comments-by-ids");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/comments-by-ids");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -4019,9 +4182,8 @@ pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::p
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
     if (sso)
     {
@@ -4038,7 +4200,6 @@ pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::p
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(commentsByIdsParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -4124,12 +4285,19 @@ pplx::task<std::shared_ptr<ModerationAPIChildCommentsResponse>> ModerationApi::p
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postFlagComment(utility::string_t commentId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postFlagComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostFlagCommentOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/flag-comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/flag-comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4166,13 +4334,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postFlagComment(uti
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -4259,12 +4426,19 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postFlagComment(uti
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PostRemoveCommentResponse>> ModerationApi::postRemoveComment(utility::string_t commentId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<PostRemoveCommentApiResponse>> ModerationApi::postRemoveComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostRemoveCommentOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/remove-comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/remove-comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4301,13 +4475,12 @@ pplx::task<std::shared_ptr<PostRemoveCommentResponse>> ModerationApi::postRemove
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -4373,7 +4546,7 @@ pplx::task<std::shared_ptr<PostRemoveCommentResponse>> ModerationApi::postRemove
     })
     .then([=, this](utility::string_t localVarResponse)
     {
-        std::shared_ptr<PostRemoveCommentResponse> localVarResult(new PostRemoveCommentResponse());
+        std::shared_ptr<PostRemoveCommentApiResponse> localVarResult(new PostRemoveCommentApiResponse());
 
         if(localVarResponseHttpContentType == utility::conversions::to_string_t("application/json"))
         {
@@ -4394,12 +4567,19 @@ pplx::task<std::shared_ptr<PostRemoveCommentResponse>> ModerationApi::postRemove
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postRestoreDeletedComment(utility::string_t commentId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postRestoreDeletedComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostRestoreDeletedCommentOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/restore-deleted-comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4436,13 +4616,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postRestoreDeletedC
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -4529,12 +4708,20 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postRestoreDeletedC
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<SetCommentApprovedResponse>> ModerationApi::postSetCommentApprovalStatus(utility::string_t commentId, boost::optional<bool> approved, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<SetCommentApprovedResponse>> ModerationApi::postSetCommentApprovalStatus(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostSetCommentApprovalStatusOptions& options
+) const
 {
+    auto approved = options.approved;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/set-comment-approval-status/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4571,6 +4758,9 @@ pplx::task<std::shared_ptr<SetCommentApprovedResponse>> ModerationApi::postSetCo
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (approved)
     {
         localVarQueryParams[utility::conversions::to_string_t("approved")] = ApiClient::parameterToString(*approved);
@@ -4579,10 +4769,6 @@ pplx::task<std::shared_ptr<SetCommentApprovedResponse>> ModerationApi::postSetCo
     {
         localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -4668,12 +4854,20 @@ pplx::task<std::shared_ptr<SetCommentApprovedResponse>> ModerationApi::postSetCo
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentReviewStatus(utility::string_t commentId, boost::optional<bool> reviewed, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentReviewStatus(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostSetCommentReviewStatusOptions& options
+) const
 {
+    auto reviewed = options.reviewed;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/set-comment-review-status/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4710,6 +4904,9 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentRevie
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (reviewed)
     {
         localVarQueryParams[utility::conversions::to_string_t("reviewed")] = ApiClient::parameterToString(*reviewed);
@@ -4718,10 +4915,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentRevie
     {
         localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -4807,12 +5000,21 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentRevie
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentSpamStatus(utility::string_t commentId, boost::optional<bool> spam, boost::optional<bool> permNotSpam, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentSpamStatus(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostSetCommentSpamStatusOptions& options
+) const
 {
+    auto spam = options.spam;
+    auto permNotSpam = options.permNotSpam;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/set-comment-spam-status/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4849,6 +5051,9 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentSpamS
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (spam)
     {
         localVarQueryParams[utility::conversions::to_string_t("spam")] = ApiClient::parameterToString(*spam);
@@ -4861,10 +5066,6 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentSpamS
     {
         localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -4950,8 +5151,16 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postSetCommentSpamS
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<SetCommentTextResponse>> ModerationApi::postSetCommentText(utility::string_t commentId, std::shared_ptr<SetCommentTextParams> setCommentTextParams, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<SetCommentTextResponse>> ModerationApi::postSetCommentText(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        std::shared_ptr<SetCommentTextParams> setCommentTextParams
+        
+        , const PostSetCommentTextOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
     // verify the required parameter 'setCommentTextParams' is set
     if (setCommentTextParams == nullptr)
@@ -4961,7 +5170,7 @@ pplx::task<std::shared_ptr<SetCommentTextResponse>> ModerationApi::postSetCommen
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/set-comment-text/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -4999,13 +5208,12 @@ pplx::task<std::shared_ptr<SetCommentTextResponse>> ModerationApi::postSetCommen
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
     localVarConsumeHttpContentTypes.insert( utility::conversions::to_string_t("application/json") );
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -5022,7 +5230,6 @@ pplx::task<std::shared_ptr<SetCommentTextResponse>> ModerationApi::postSetCommen
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(setCommentTextParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -5108,12 +5315,19 @@ pplx::task<std::shared_ptr<SetCommentTextResponse>> ModerationApi::postSetCommen
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postUnFlagComment(utility::string_t commentId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postUnFlagComment(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostUnFlagCommentOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/un-flag-comment/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -5150,13 +5364,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postUnFlagComment(u
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
-    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
+    if (broadcastId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
     if (sso)
     {
@@ -5243,12 +5456,20 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::postUnFlagComment(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<VoteResponse>> ModerationApi::postVote(utility::string_t commentId, boost::optional<utility::string_t> direction, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<VoteResponse>> ModerationApi::postVote(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const PostVoteOptions& options
+) const
 {
+    auto direction = options.direction;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/vote/{commentId}");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/vote/{commentId}");
     boost::replace_all(localVarPath, utility::conversions::to_string_t("{") + utility::conversions::to_string_t("commentId") + utility::conversions::to_string_t("}"), web::uri::encode_uri(ApiClient::parameterToString(commentId)));
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
@@ -5285,6 +5506,9 @@ pplx::task<std::shared_ptr<VoteResponse>> ModerationApi::postVote(utility::strin
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (direction)
     {
         localVarQueryParams[utility::conversions::to_string_t("direction")] = ApiClient::parameterToString(*direction);
@@ -5293,10 +5517,6 @@ pplx::task<std::shared_ptr<VoteResponse>> ModerationApi::postVote(utility::strin
     {
         localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -5382,12 +5602,21 @@ pplx::task<std::shared_ptr<VoteResponse>> ModerationApi::postVote(utility::strin
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<AwardUserBadgeResponse>> ModerationApi::putAwardBadge(utility::string_t badgeId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> commentId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<AwardUserBadgeResponse>> ModerationApi::putAwardBadge(
+        utility::string_t tenantId,
+        utility::string_t badgeId
+        
+        , const PutAwardBadgeOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto commentId = options.commentId;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/award-badge");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/award-badge");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -5423,6 +5652,9 @@ pplx::task<std::shared_ptr<AwardUserBadgeResponse>> ModerationApi::putAwardBadge
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     {
         localVarQueryParams[utility::conversions::to_string_t("badgeId")] = ApiClient::parameterToString(badgeId);
     }
@@ -5438,10 +5670,6 @@ pplx::task<std::shared_ptr<AwardUserBadgeResponse>> ModerationApi::putAwardBadge
     {
         localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -5527,12 +5755,16 @@ pplx::task<std::shared_ptr<AwardUserBadgeResponse>> ModerationApi::putAwardBadge
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putCloseThread(utility::string_t urlId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putCloseThread(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/close-thread");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/close-thread");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -5569,11 +5801,10 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putCloseThread(util
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
     {
-        localVarQueryParams[utility::conversions::to_string_t("urlId")] = ApiClient::parameterToString(urlId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("urlId")] = ApiClient::parameterToString(urlId);
     }
     if (sso)
     {
@@ -5660,12 +5891,21 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putCloseThread(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<RemoveUserBadgeResponse>> ModerationApi::putRemoveBadge(utility::string_t badgeId, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> commentId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<RemoveUserBadgeResponse>> ModerationApi::putRemoveBadge(
+        utility::string_t tenantId,
+        utility::string_t badgeId
+        
+        , const PutRemoveBadgeOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto commentId = options.commentId;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/remove-badge");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/remove-badge");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -5701,6 +5941,9 @@ pplx::task<std::shared_ptr<RemoveUserBadgeResponse>> ModerationApi::putRemoveBad
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     {
         localVarQueryParams[utility::conversions::to_string_t("badgeId")] = ApiClient::parameterToString(badgeId);
     }
@@ -5716,10 +5959,6 @@ pplx::task<std::shared_ptr<RemoveUserBadgeResponse>> ModerationApi::putRemoveBad
     {
         localVarQueryParams[utility::conversions::to_string_t("broadcastId")] = ApiClient::parameterToString(*broadcastId);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
@@ -5805,12 +6044,16 @@ pplx::task<std::shared_ptr<RemoveUserBadgeResponse>> ModerationApi::putRemoveBad
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putReopenThread(utility::string_t urlId, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putReopenThread(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/reopen-thread");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/reopen-thread");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -5847,11 +6090,10 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putReopenThread(uti
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
     {
-        localVarQueryParams[utility::conversions::to_string_t("urlId")] = ApiClient::parameterToString(urlId);
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
     }
-    if (tenantId)
     {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
+        localVarQueryParams[utility::conversions::to_string_t("urlId")] = ApiClient::parameterToString(urlId);
     }
     if (sso)
     {
@@ -5938,12 +6180,19 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> ModerationApi::putReopenThread(uti
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<SetUserTrustFactorResponse>> ModerationApi::setTrustFactor(boost::optional<utility::string_t> userId, boost::optional<utility::string_t> trustFactor, boost::optional<utility::string_t> tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<SetUserTrustFactorResponse>> ModerationApi::setTrustFactor(
+        utility::string_t tenantId
+        
+        , const SetTrustFactorOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto trustFactor = options.trustFactor;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
-    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/set-trust-factor");
+    utility::string_t localVarPath = utility::conversions::to_string_t("/auth/my-account/moderate-comments/mod_api/set-trust-factor");
 
     std::map<utility::string_t, utility::string_t> localVarQueryParams;
     std::map<utility::string_t, utility::string_t> localVarHeaderParams( localVarApiConfiguration->getDefaultHeaders() );
@@ -5979,6 +6228,9 @@ pplx::task<std::shared_ptr<SetUserTrustFactorResponse>> ModerationApi::setTrustF
 
     std::unordered_set<utility::string_t> localVarConsumeHttpContentTypes;
 
+    {
+        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(tenantId);
+    }
     if (userId)
     {
         localVarQueryParams[utility::conversions::to_string_t("userId")] = ApiClient::parameterToString(*userId);
@@ -5987,10 +6239,6 @@ pplx::task<std::shared_ptr<SetUserTrustFactorResponse>> ModerationApi::setTrustF
     {
         localVarQueryParams[utility::conversions::to_string_t("trustFactor")] = ApiClient::parameterToString(*trustFactor);
     }
-    if (tenantId)
-    {
-        localVarQueryParams[utility::conversions::to_string_t("tenantId")] = ApiClient::parameterToString(*tenantId);
-    }
     if (sso)
     {
         localVarQueryParams[utility::conversions::to_string_t("sso")] = ApiClient::parameterToString(*sso);
diff --git a/client/src/api/PublicApi.cpp b/client/src/api/PublicApi.cpp
index f5eaff7..21b0ee2 100644
--- a/client/src/api/PublicApi.cpp
+++ b/client/src/api/PublicApi.cpp
@@ -35,7 +35,12 @@ PublicApi::~PublicApi()
 {
 }
 
-pplx::task<std::shared_ptr<BlockSuccess>> PublicApi::blockFromCommentPublic(utility::string_t tenantId, utility::string_t commentId, std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<BlockSuccess>> PublicApi::blockFromCommentPublic(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams
+        , boost::optional<utility::string_t> sso
+) const
 {
 
     // verify the required parameter 'publicBlockFromCommentParams' is set
@@ -102,7 +107,6 @@ pplx::task<std::shared_ptr<BlockSuccess>> PublicApi::blockFromCommentPublic(util
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(publicBlockFromCommentParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -188,7 +192,11 @@ pplx::task<std::shared_ptr<BlockSuccess>> PublicApi::blockFromCommentPublic(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CheckBlockedCommentsResponse>> PublicApi::checkedCommentsForBlocked(utility::string_t tenantId, utility::string_t commentIds, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<CheckBlockedCommentsResponse>> PublicApi::checkedCommentsForBlocked(
+        utility::string_t tenantId,
+        utility::string_t commentIds
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -320,8 +328,17 @@ pplx::task<std::shared_ptr<CheckBlockedCommentsResponse>> PublicApi::checkedComm
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<SaveCommentsResponseWithPresence>> PublicApi::createCommentPublic(utility::string_t tenantId, utility::string_t urlId, utility::string_t broadcastId, std::shared_ptr<CommentData> commentData, boost::optional<utility::string_t> sessionId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<SaveCommentsResponseWithPresence>> PublicApi::createCommentPublic(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t broadcastId,
+        std::shared_ptr<CommentData> commentData
+        
+        , const CreateCommentPublicOptions& options
+) const
 {
+    auto sessionId = options.sessionId;
+    auto sso = options.sso;
 
     // verify the required parameter 'commentData' is set
     if (commentData == nullptr)
@@ -394,7 +411,6 @@ pplx::task<std::shared_ptr<SaveCommentsResponseWithPresence>> PublicApi::createC
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(commentData);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -480,8 +496,15 @@ pplx::task<std::shared_ptr<SaveCommentsResponseWithPresence>> PublicApi::createC
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::createFeedPostPublic(utility::string_t tenantId, std::shared_ptr<CreateFeedPostParams> createFeedPostParams, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::createFeedPostPublic(
+        utility::string_t tenantId,
+        std::shared_ptr<CreateFeedPostParams> createFeedPostParams
+        
+        , const CreateFeedPostPublicOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
     // verify the required parameter 'createFeedPostParams' is set
     if (createFeedPostParams == nullptr)
@@ -548,7 +571,6 @@ pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::createFeedPostPub
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(createFeedPostParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -634,7 +656,11 @@ pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::createFeedPostPub
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::createV1PageReact(utility::string_t tenantId, utility::string_t urlId, boost::optional<utility::string_t> title) const
+pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::createV1PageReact(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        , boost::optional<utility::string_t> title
+) const
 {
 
 
@@ -764,7 +790,12 @@ pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::createV1PageReact(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::createV2PageReact(utility::string_t tenantId, utility::string_t urlId, utility::string_t id, boost::optional<utility::string_t> title) const
+pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::createV2PageReact(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t id
+        , boost::optional<utility::string_t> title
+) const
 {
 
 
@@ -897,8 +928,16 @@ pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::createV2PageReact(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PublicAPIDeleteCommentResponse>> PublicApi::deleteCommentPublic(utility::string_t tenantId, utility::string_t commentId, utility::string_t broadcastId, boost::optional<utility::string_t> editKey, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<PublicAPIDeleteCommentResponse>> PublicApi::deleteCommentPublic(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t broadcastId
+        
+        , const DeleteCommentPublicOptions& options
+) const
 {
+    auto editKey = options.editKey;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -1032,8 +1071,18 @@ pplx::task<std::shared_ptr<PublicAPIDeleteCommentResponse>> PublicApi::deleteCom
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<VoteDeleteResponse>> PublicApi::deleteCommentVote(utility::string_t tenantId, utility::string_t commentId, utility::string_t voteId, utility::string_t urlId, utility::string_t broadcastId, boost::optional<utility::string_t> editKey, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<VoteDeleteResponse>> PublicApi::deleteCommentVote(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t voteId,
+        utility::string_t urlId,
+        utility::string_t broadcastId
+        
+        , const DeleteCommentVoteOptions& options
+) const
 {
+    auto editKey = options.editKey;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -1171,8 +1220,15 @@ pplx::task<std::shared_ptr<VoteDeleteResponse>> PublicApi::deleteCommentVote(uti
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<DeleteFeedPostPublicResponse>> PublicApi::deleteFeedPostPublic(utility::string_t tenantId, utility::string_t postId, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<DeleteFeedPostPublicResponse>> PublicApi::deleteFeedPostPublic(
+        utility::string_t tenantId,
+        utility::string_t postId
+        
+        , const DeleteFeedPostPublicOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -1303,7 +1359,11 @@ pplx::task<std::shared_ptr<DeleteFeedPostPublicResponse>> PublicApi::deleteFeedP
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::deleteV1PageReact(utility::string_t tenantId, utility::string_t urlId) const
+pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::deleteV1PageReact(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+) const
 {
 
 
@@ -1429,7 +1489,12 @@ pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::deleteV1PageReact(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::deleteV2PageReact(utility::string_t tenantId, utility::string_t urlId, utility::string_t id) const
+pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::deleteV2PageReact(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -1558,7 +1623,12 @@ pplx::task<std::shared_ptr<CreateV1PageReact>> PublicApi::deleteV2PageReact(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::flagCommentPublic(utility::string_t tenantId, utility::string_t commentId, bool isFlagged, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::flagCommentPublic(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        bool isFlagged
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -1691,8 +1761,15 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::flagCommentPublic(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PublicAPIGetCommentTextResponse>> PublicApi::getCommentText(utility::string_t tenantId, utility::string_t commentId, boost::optional<utility::string_t> editKey, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<PublicAPIGetCommentTextResponse>> PublicApi::getCommentText(
+        utility::string_t tenantId,
+        utility::string_t commentId
+        
+        , const GetCommentTextOptions& options
+) const
 {
+    auto editKey = options.editKey;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -1823,7 +1900,12 @@ pplx::task<std::shared_ptr<PublicAPIGetCommentTextResponse>> PublicApi::getComme
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetCommentVoteUserNamesSuccessResponse>> PublicApi::getCommentVoteUserNames(utility::string_t tenantId, utility::string_t commentId, int32_t dir, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetCommentVoteUserNamesSuccessResponse>> PublicApi::getCommentVoteUserNames(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        int32_t dir
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -1954,8 +2036,18 @@ pplx::task<std::shared_ptr<GetCommentVoteUserNamesSuccessResponse>> PublicApi::g
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetCommentsForUserResponse>> PublicApi::getCommentsForUser(boost::optional<utility::string_t> userId, boost::optional<std::shared_ptr<SortDirections>> direction, boost::optional<utility::string_t> repliesToUserId, boost::optional<double> page, boost::optional<bool> includei10n, boost::optional<utility::string_t> locale, boost::optional<bool> isCrawler) const
+pplx::task<std::shared_ptr<GetCommentsForUserResponse>> PublicApi::getCommentsForUser(
+        
+        const GetCommentsForUserOptions& options
+) const
 {
+    auto userId = options.userId;
+    auto direction = options.direction;
+    auto repliesToUserId = options.repliesToUserId;
+    auto page = options.page;
+    auto includei10n = options.includei10n;
+    auto locale = options.locale;
+    auto isCrawler = options.isCrawler;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -2104,8 +2196,39 @@ pplx::task<std::shared_ptr<GetCommentsForUserResponse>> PublicApi::getCommentsFo
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetCommentsResponseWithPresence_PublicComment_>> PublicApi::getCommentsPublic(utility::string_t tenantId, utility::string_t urlId, boost::optional<int32_t> page, boost::optional<std::shared_ptr<SortDirections>> direction, boost::optional<utility::string_t> sso, boost::optional<int32_t> skip, boost::optional<int32_t> skipChildren, boost::optional<int32_t> limit, boost::optional<int32_t> limitChildren, boost::optional<bool> countChildren, boost::optional<utility::string_t> fetchPageForCommentId, boost::optional<bool> includeConfig, boost::optional<bool> countAll, boost::optional<bool> includei10n, boost::optional<utility::string_t> locale, boost::optional<utility::string_t> modules, boost::optional<bool> isCrawler, boost::optional<bool> includeNotificationCount, boost::optional<bool> asTree, boost::optional<int32_t> maxTreeDepth, boost::optional<bool> useFullTranslationIds, boost::optional<utility::string_t> parentId, boost::optional<utility::string_t> searchText, boost::optional<std::vector<utility::string_t>> hashTags, boost::optional<utility::string_t> userId, boost::optional<utility::string_t> customConfigStr, boost::optional<utility::string_t> afterCommentId, boost::optional<utility::string_t> beforeCommentId) const
+pplx::task<std::shared_ptr<GetCommentsResponseWithPresence_PublicComment_>> PublicApi::getCommentsPublic(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+        , const GetCommentsPublicOptions& options
+) const
 {
+    auto page = options.page;
+    auto direction = options.direction;
+    auto sso = options.sso;
+    auto skip = options.skip;
+    auto skipChildren = options.skipChildren;
+    auto limit = options.limit;
+    auto limitChildren = options.limitChildren;
+    auto countChildren = options.countChildren;
+    auto fetchPageForCommentId = options.fetchPageForCommentId;
+    auto includeConfig = options.includeConfig;
+    auto countAll = options.countAll;
+    auto includei10n = options.includei10n;
+    auto locale = options.locale;
+    auto modules = options.modules;
+    auto isCrawler = options.isCrawler;
+    auto includeNotificationCount = options.includeNotificationCount;
+    auto asTree = options.asTree;
+    auto maxTreeDepth = options.maxTreeDepth;
+    auto useFullTranslationIds = options.useFullTranslationIds;
+    auto parentId = options.parentId;
+    auto searchText = options.searchText;
+    auto hashTags = options.hashTags;
+    auto userId = options.userId;
+    auto customConfigStr = options.customConfigStr;
+    auto afterCommentId = options.afterCommentId;
+    auto beforeCommentId = options.beforeCommentId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -2334,7 +2457,13 @@ pplx::task<std::shared_ptr<GetCommentsResponseWithPresence_PublicComment_>> Publ
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetEventLogResponse>> PublicApi::getEventLog(utility::string_t tenantId, utility::string_t urlId, utility::string_t userIdWS, int64_t startTime, boost::optional<int64_t> endTime) const
+pplx::task<std::shared_ptr<GetEventLogResponse>> PublicApi::getEventLog(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t userIdWS,
+        int64_t startTime
+        , boost::optional<int64_t> endTime
+) const
 {
 
 
@@ -2470,8 +2599,18 @@ pplx::task<std::shared_ptr<GetEventLogResponse>> PublicApi::getEventLog(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PublicFeedPostsResponse>> PublicApi::getFeedPostsPublic(utility::string_t tenantId, boost::optional<utility::string_t> afterId, boost::optional<int32_t> limit, boost::optional<std::vector<utility::string_t>> tags, boost::optional<utility::string_t> sso, boost::optional<bool> isCrawler, boost::optional<bool> includeUserInfo) const
+pplx::task<std::shared_ptr<PublicFeedPostsResponse>> PublicApi::getFeedPostsPublic(
+        utility::string_t tenantId
+        
+        , const GetFeedPostsPublicOptions& options
+) const
 {
+    auto afterId = options.afterId;
+    auto limit = options.limit;
+    auto tags = options.tags;
+    auto sso = options.sso;
+    auto isCrawler = options.isCrawler;
+    auto includeUserInfo = options.includeUserInfo;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -2617,7 +2756,11 @@ pplx::task<std::shared_ptr<PublicFeedPostsResponse>> PublicApi::getFeedPostsPubl
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<FeedPostsStatsResponse>> PublicApi::getFeedPostsStats(utility::string_t tenantId, std::vector<utility::string_t> postIds, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<FeedPostsStatsResponse>> PublicApi::getFeedPostsStats(
+        utility::string_t tenantId,
+        std::vector<utility::string_t> postIds
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -2747,7 +2890,11 @@ pplx::task<std::shared_ptr<FeedPostsStatsResponse>> PublicApi::getFeedPostsStats
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GifGetLargeResponse>> PublicApi::getGifLarge(utility::string_t tenantId, utility::string_t largeInternalURLSanitized) const
+pplx::task<std::shared_ptr<GifGetLargeResponse>> PublicApi::getGifLarge(
+        utility::string_t tenantId,
+        utility::string_t largeInternalURLSanitized
+        
+) const
 {
 
 
@@ -2873,8 +3020,16 @@ pplx::task<std::shared_ptr<GifGetLargeResponse>> PublicApi::getGifLarge(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetGifsSearchResponse>> PublicApi::getGifsSearch(utility::string_t tenantId, utility::string_t search, boost::optional<utility::string_t> locale, boost::optional<utility::string_t> rating, boost::optional<double> page) const
+pplx::task<std::shared_ptr<GetGifsSearchResponse>> PublicApi::getGifsSearch(
+        utility::string_t tenantId,
+        utility::string_t search
+        
+        , const GetGifsSearchOptions& options
+) const
 {
+    auto locale = options.locale;
+    auto rating = options.rating;
+    auto page = options.page;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3011,8 +3166,15 @@ pplx::task<std::shared_ptr<GetGifsSearchResponse>> PublicApi::getGifsSearch(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetGifsTrendingResponse>> PublicApi::getGifsTrending(utility::string_t tenantId, boost::optional<utility::string_t> locale, boost::optional<utility::string_t> rating, boost::optional<double> page) const
+pplx::task<std::shared_ptr<GetGifsTrendingResponse>> PublicApi::getGifsTrending(
+        utility::string_t tenantId
+        
+        , const GetGifsTrendingOptions& options
+) const
 {
+    auto locale = options.locale;
+    auto rating = options.rating;
+    auto page = options.page;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3146,7 +3308,13 @@ pplx::task<std::shared_ptr<GetGifsTrendingResponse>> PublicApi::getGifsTrending(
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetEventLogResponse>> PublicApi::getGlobalEventLog(utility::string_t tenantId, utility::string_t urlId, utility::string_t userIdWS, int64_t startTime, boost::optional<int64_t> endTime) const
+pplx::task<std::shared_ptr<GetEventLogResponse>> PublicApi::getGlobalEventLog(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t userIdWS,
+        int64_t startTime
+        , boost::optional<int64_t> endTime
+) const
 {
 
 
@@ -3282,8 +3450,15 @@ pplx::task<std::shared_ptr<GetEventLogResponse>> PublicApi::getGlobalEventLog(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PageUsersOfflineResponse>> PublicApi::getOfflineUsers(utility::string_t tenantId, utility::string_t urlId, boost::optional<utility::string_t> afterName, boost::optional<utility::string_t> afterUserId) const
+pplx::task<std::shared_ptr<PageUsersOfflineResponse>> PublicApi::getOfflineUsers(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+        , const GetOfflineUsersOptions& options
+) const
 {
+    auto afterName = options.afterName;
+    auto afterUserId = options.afterUserId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3416,8 +3591,15 @@ pplx::task<std::shared_ptr<PageUsersOfflineResponse>> PublicApi::getOfflineUsers
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PageUsersOnlineResponse>> PublicApi::getOnlineUsers(utility::string_t tenantId, utility::string_t urlId, boost::optional<utility::string_t> afterName, boost::optional<utility::string_t> afterUserId) const
+pplx::task<std::shared_ptr<PageUsersOnlineResponse>> PublicApi::getOnlineUsers(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+        , const GetOnlineUsersOptions& options
+) const
 {
+    auto afterName = options.afterName;
+    auto afterUserId = options.afterUserId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3550,8 +3732,17 @@ pplx::task<std::shared_ptr<PageUsersOnlineResponse>> PublicApi::getOnlineUsers(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetPublicPagesResponse>> PublicApi::getPagesPublic(utility::string_t tenantId, boost::optional<utility::string_t> cursor, boost::optional<int32_t> limit, boost::optional<utility::string_t> q, boost::optional<std::shared_ptr<PagesSortBy>> sortBy, boost::optional<bool> hasComments) const
+pplx::task<std::shared_ptr<GetPublicPagesResponse>> PublicApi::getPagesPublic(
+        utility::string_t tenantId
+        
+        , const GetPagesPublicOptions& options
+) const
 {
+    auto cursor = options.cursor;
+    auto limit = options.limit;
+    auto q = options.q;
+    auto sortBy = options.sortBy;
+    auto hasComments = options.hasComments;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3693,8 +3884,15 @@ pplx::task<std::shared_ptr<GetPublicPagesResponse>> PublicApi::getPagesPublic(ut
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetTranslationsResponse>> PublicApi::getTranslations(utility::string_t r_namespace, utility::string_t component, boost::optional<utility::string_t> locale, boost::optional<bool> useFullTranslationIds) const
+pplx::task<std::shared_ptr<GetTranslationsResponse>> PublicApi::getTranslations(
+        utility::string_t r_namespace,
+        utility::string_t component
+        
+        , const GetTranslationsOptions& options
+) const
 {
+    auto locale = options.locale;
+    auto useFullTranslationIds = options.useFullTranslationIds;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -3825,7 +4023,10 @@ pplx::task<std::shared_ptr<GetTranslationsResponse>> PublicApi::getTranslations(
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetUserNotificationCountResponse>> PublicApi::getUserNotificationCount(utility::string_t tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetUserNotificationCountResponse>> PublicApi::getUserNotificationCount(
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -3954,8 +4155,23 @@ pplx::task<std::shared_ptr<GetUserNotificationCountResponse>> PublicApi::getUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetMyNotificationsResponse>> PublicApi::getUserNotifications(utility::string_t tenantId, boost::optional<utility::string_t> urlId, boost::optional<int32_t> pageSize, boost::optional<utility::string_t> afterId, boost::optional<bool> includeContext, boost::optional<int64_t> afterCreatedAt, boost::optional<bool> unreadOnly, boost::optional<bool> dmOnly, boost::optional<bool> noDm, boost::optional<bool> includeTranslations, boost::optional<bool> includeTenantNotifications, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<GetMyNotificationsResponse>> PublicApi::getUserNotifications(
+        utility::string_t tenantId
+        
+        , const GetUserNotificationsOptions& options
+) const
 {
+    auto urlId = options.urlId;
+    auto pageSize = options.pageSize;
+    auto afterId = options.afterId;
+    auto includeContext = options.includeContext;
+    auto afterCreatedAt = options.afterCreatedAt;
+    auto unreadOnly = options.unreadOnly;
+    auto dmOnly = options.dmOnly;
+    auto noDm = options.noDm;
+    auto includeTranslations = options.includeTranslations;
+    auto includeTenantNotifications = options.includeTenantNotifications;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -4123,7 +4339,12 @@ pplx::task<std::shared_ptr<GetMyNotificationsResponse>> PublicApi::getUserNotifi
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetUserPresenceStatusesResponse>> PublicApi::getUserPresenceStatuses(utility::string_t tenantId, utility::string_t urlIdWS, utility::string_t userIds) const
+pplx::task<std::shared_ptr<GetUserPresenceStatusesResponse>> PublicApi::getUserPresenceStatuses(
+        utility::string_t tenantId,
+        utility::string_t urlIdWS,
+        utility::string_t userIds
+        
+) const
 {
 
 
@@ -4254,8 +4475,14 @@ pplx::task<std::shared_ptr<GetUserPresenceStatusesResponse>> PublicApi::getUserP
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UserReactsResponse>> PublicApi::getUserReactsPublic(utility::string_t tenantId, boost::optional<std::vector<utility::string_t>> postIds, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<UserReactsResponse>> PublicApi::getUserReactsPublic(
+        utility::string_t tenantId
+        
+        , const GetUserReactsPublicOptions& options
+) const
 {
+    auto postIds = options.postIds;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -4385,7 +4612,11 @@ pplx::task<std::shared_ptr<UserReactsResponse>> PublicApi::getUserReactsPublic(u
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PageUsersInfoResponse>> PublicApi::getUsersInfo(utility::string_t tenantId, utility::string_t ids) const
+pplx::task<std::shared_ptr<PageUsersInfoResponse>> PublicApi::getUsersInfo(
+        utility::string_t tenantId,
+        utility::string_t ids
+        
+) const
 {
 
 
@@ -4511,7 +4742,11 @@ pplx::task<std::shared_ptr<PageUsersInfoResponse>> PublicApi::getUsersInfo(utili
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetV1PageLikes>> PublicApi::getV1PageLikes(utility::string_t tenantId, utility::string_t urlId) const
+pplx::task<std::shared_ptr<GetV1PageLikes>> PublicApi::getV1PageLikes(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+) const
 {
 
 
@@ -4637,7 +4872,12 @@ pplx::task<std::shared_ptr<GetV1PageLikes>> PublicApi::getV1PageLikes(utility::s
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetV2PageReactUsersResponse>> PublicApi::getV2PageReactUsers(utility::string_t tenantId, utility::string_t urlId, utility::string_t id) const
+pplx::task<std::shared_ptr<GetV2PageReactUsersResponse>> PublicApi::getV2PageReactUsers(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t id
+        
+) const
 {
 
 
@@ -4766,7 +5006,11 @@ pplx::task<std::shared_ptr<GetV2PageReactUsersResponse>> PublicApi::getV2PageRea
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<GetV2PageReacts>> PublicApi::getV2PageReacts(utility::string_t tenantId, utility::string_t urlId) const
+pplx::task<std::shared_ptr<GetV2PageReacts>> PublicApi::getV2PageReacts(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+) const
 {
 
 
@@ -4892,7 +5136,12 @@ pplx::task<std::shared_ptr<GetV2PageReacts>> PublicApi::getV2PageReacts(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::lockComment(utility::string_t tenantId, utility::string_t commentId, utility::string_t broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::lockComment(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -5023,7 +5272,9 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::lockComment(utility::st
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::logoutPublic() const
+pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::logoutPublic(
+        
+) const
 {
 
 
@@ -5145,7 +5396,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::logoutPublic() const
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> PublicApi::pinComment(utility::string_t tenantId, utility::string_t commentId, utility::string_t broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> PublicApi::pinComment(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -5276,8 +5532,17 @@ pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> PublicApi::pinCommen
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ReactFeedPostResponse>> PublicApi::reactFeedPostPublic(utility::string_t tenantId, utility::string_t postId, std::shared_ptr<ReactBodyParams> reactBodyParams, boost::optional<bool> isUndo, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ReactFeedPostResponse>> PublicApi::reactFeedPostPublic(
+        utility::string_t tenantId,
+        utility::string_t postId,
+        std::shared_ptr<ReactBodyParams> reactBodyParams
+        
+        , const ReactFeedPostPublicOptions& options
+) const
 {
+    auto isUndo = options.isUndo;
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
     // verify the required parameter 'reactBodyParams' is set
     if (reactBodyParams == nullptr)
@@ -5349,7 +5614,6 @@ pplx::task<std::shared_ptr<ReactFeedPostResponse>> PublicApi::reactFeedPostPubli
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(reactBodyParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -5435,7 +5699,10 @@ pplx::task<std::shared_ptr<ReactFeedPostResponse>> PublicApi::reactFeedPostPubli
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> PublicApi::resetUserNotificationCount(utility::string_t tenantId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> PublicApi::resetUserNotificationCount(
+        utility::string_t tenantId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -5564,8 +5831,18 @@ pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> PublicApi::resetUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> PublicApi::resetUserNotifications(utility::string_t tenantId, boost::optional<utility::string_t> afterId, boost::optional<int64_t> afterCreatedAt, boost::optional<bool> unreadOnly, boost::optional<bool> dmOnly, boost::optional<bool> noDm, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> PublicApi::resetUserNotifications(
+        utility::string_t tenantId
+        
+        , const ResetUserNotificationsOptions& options
+) const
 {
+    auto afterId = options.afterId;
+    auto afterCreatedAt = options.afterCreatedAt;
+    auto unreadOnly = options.unreadOnly;
+    auto dmOnly = options.dmOnly;
+    auto noDm = options.noDm;
+    auto sso = options.sso;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -5713,8 +5990,17 @@ pplx::task<std::shared_ptr<ResetUserNotificationsResponse>> PublicApi::resetUser
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<SearchUsersResult>> PublicApi::searchUsers(utility::string_t tenantId, utility::string_t urlId, boost::optional<utility::string_t> usernameStartsWith, boost::optional<std::vector<utility::string_t>> mentionGroupIds, boost::optional<utility::string_t> sso, boost::optional<utility::string_t> searchSection) const
+pplx::task<std::shared_ptr<SearchUsersResult>> PublicApi::searchUsers(
+        utility::string_t tenantId,
+        utility::string_t urlId
+        
+        , const SearchUsersOptions& options
+) const
 {
+    auto usernameStartsWith = options.usernameStartsWith;
+    auto mentionGroupIds = options.mentionGroupIds;
+    auto sso = options.sso;
+    auto searchSection = options.searchSection;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -5855,8 +6141,17 @@ pplx::task<std::shared_ptr<SearchUsersResult>> PublicApi::searchUsers(utility::s
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<PublicAPISetCommentTextResponse>> PublicApi::setCommentText(utility::string_t tenantId, utility::string_t commentId, utility::string_t broadcastId, std::shared_ptr<CommentTextUpdateRequest> commentTextUpdateRequest, boost::optional<utility::string_t> editKey, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<PublicAPISetCommentTextResponse>> PublicApi::setCommentText(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t broadcastId,
+        std::shared_ptr<CommentTextUpdateRequest> commentTextUpdateRequest
+        
+        , const SetCommentTextOptions& options
+) const
 {
+    auto editKey = options.editKey;
+    auto sso = options.sso;
 
     // verify the required parameter 'commentTextUpdateRequest' is set
     if (commentTextUpdateRequest == nullptr)
@@ -5927,7 +6222,6 @@ pplx::task<std::shared_ptr<PublicAPISetCommentTextResponse>> PublicApi::setComme
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(commentTextUpdateRequest);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -6013,7 +6307,12 @@ pplx::task<std::shared_ptr<PublicAPISetCommentTextResponse>> PublicApi::setComme
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UnblockSuccess>> PublicApi::unBlockCommentPublic(utility::string_t tenantId, utility::string_t commentId, std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<UnblockSuccess>> PublicApi::unBlockCommentPublic(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        std::shared_ptr<PublicBlockFromCommentParams> publicBlockFromCommentParams
+        , boost::optional<utility::string_t> sso
+) const
 {
 
     // verify the required parameter 'publicBlockFromCommentParams' is set
@@ -6080,7 +6379,6 @@ pplx::task<std::shared_ptr<UnblockSuccess>> PublicApi::unBlockCommentPublic(util
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(publicBlockFromCommentParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -6166,7 +6464,12 @@ pplx::task<std::shared_ptr<UnblockSuccess>> PublicApi::unBlockCommentPublic(util
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::unLockComment(utility::string_t tenantId, utility::string_t commentId, utility::string_t broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::unLockComment(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -6297,7 +6600,12 @@ pplx::task<std::shared_ptr<APIEmptyResponse>> PublicApi::unLockComment(utility::
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> PublicApi::unPinComment(utility::string_t tenantId, utility::string_t commentId, utility::string_t broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> PublicApi::unPinComment(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t broadcastId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -6428,8 +6736,16 @@ pplx::task<std::shared_ptr<ChangeCommentPinStatusResponse>> PublicApi::unPinComm
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::updateFeedPostPublic(utility::string_t tenantId, utility::string_t postId, std::shared_ptr<UpdateFeedPostParams> updateFeedPostParams, boost::optional<utility::string_t> broadcastId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::updateFeedPostPublic(
+        utility::string_t tenantId,
+        utility::string_t postId,
+        std::shared_ptr<UpdateFeedPostParams> updateFeedPostParams
+        
+        , const UpdateFeedPostPublicOptions& options
+) const
 {
+    auto broadcastId = options.broadcastId;
+    auto sso = options.sso;
 
     // verify the required parameter 'updateFeedPostParams' is set
     if (updateFeedPostParams == nullptr)
@@ -6497,7 +6813,6 @@ pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::updateFeedPostPub
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(updateFeedPostParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
@@ -6583,7 +6898,13 @@ pplx::task<std::shared_ptr<CreateFeedPostResponse>> PublicApi::updateFeedPostPub
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UpdateUserNotificationCommentSubscriptionStatusResponse>> PublicApi::updateUserNotificationCommentSubscriptionStatus(utility::string_t tenantId, utility::string_t notificationId, utility::string_t optedInOrOut, utility::string_t commentId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<UpdateUserNotificationCommentSubscriptionStatusResponse>> PublicApi::updateUserNotificationCommentSubscriptionStatus(
+        utility::string_t tenantId,
+        utility::string_t notificationId,
+        utility::string_t optedInOrOut,
+        utility::string_t commentId
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -6717,7 +7038,14 @@ pplx::task<std::shared_ptr<UpdateUserNotificationCommentSubscriptionStatusRespon
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UpdateUserNotificationPageSubscriptionStatusResponse>> PublicApi::updateUserNotificationPageSubscriptionStatus(utility::string_t tenantId, utility::string_t urlId, utility::string_t url, utility::string_t pageTitle, utility::string_t subscribedOrUnsubscribed, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<UpdateUserNotificationPageSubscriptionStatusResponse>> PublicApi::updateUserNotificationPageSubscriptionStatus(
+        utility::string_t tenantId,
+        utility::string_t urlId,
+        utility::string_t url,
+        utility::string_t pageTitle,
+        utility::string_t subscribedOrUnsubscribed
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -6856,7 +7184,12 @@ pplx::task<std::shared_ptr<UpdateUserNotificationPageSubscriptionStatusResponse>
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UpdateUserNotificationStatusResponse>> PublicApi::updateUserNotificationStatus(utility::string_t tenantId, utility::string_t notificationId, utility::string_t newStatus, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<UpdateUserNotificationStatusResponse>> PublicApi::updateUserNotificationStatus(
+        utility::string_t tenantId,
+        utility::string_t notificationId,
+        utility::string_t newStatus
+        , boost::optional<utility::string_t> sso
+) const
 {
 
 
@@ -6987,8 +7320,15 @@ pplx::task<std::shared_ptr<UpdateUserNotificationStatusResponse>> PublicApi::upd
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<UploadImageResponse>> PublicApi::uploadImage(utility::string_t tenantId, std::shared_ptr<HttpContent> file, boost::optional<std::shared_ptr<SizePreset>> sizePreset, boost::optional<utility::string_t> urlId) const
+pplx::task<std::shared_ptr<UploadImageResponse>> PublicApi::uploadImage(
+        utility::string_t tenantId,
+        std::shared_ptr<HttpContent> file
+        
+        , const UploadImageOptions& options
+) const
 {
+    auto sizePreset = options.sizePreset;
+    auto urlId = options.urlId;
 
 
     std::shared_ptr<const ApiConfiguration> localVarApiConfiguration( m_ApiClient->getConfiguration() );
@@ -7122,8 +7462,18 @@ pplx::task<std::shared_ptr<UploadImageResponse>> PublicApi::uploadImage(utility:
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<VoteResponse>> PublicApi::voteComment(utility::string_t tenantId, utility::string_t commentId, utility::string_t urlId, utility::string_t broadcastId, std::shared_ptr<VoteBodyParams> voteBodyParams, boost::optional<utility::string_t> sessionId, boost::optional<utility::string_t> sso) const
+pplx::task<std::shared_ptr<VoteResponse>> PublicApi::voteComment(
+        utility::string_t tenantId,
+        utility::string_t commentId,
+        utility::string_t urlId,
+        utility::string_t broadcastId,
+        std::shared_ptr<VoteBodyParams> voteBodyParams
+        
+        , const VoteCommentOptions& options
+) const
 {
+    auto sessionId = options.sessionId;
+    auto sso = options.sso;
 
     // verify the required parameter 'voteBodyParams' is set
     if (voteBodyParams == nullptr)
@@ -7197,7 +7547,6 @@ pplx::task<std::shared_ptr<VoteResponse>> PublicApi::voteComment(utility::string
         web::json::value localVarJson;
 
         localVarJson = ModelBase::toJson(voteBodyParams);
-        
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
     }
diff --git a/client/src/model/PostRemoveCommentResponse.cpp b/client/src/model/PostRemoveCommentApiResponse.cpp
similarity index 76%
rename from client/src/model/PostRemoveCommentResponse.cpp
rename to client/src/model/PostRemoveCommentApiResponse.cpp
index 99f1262..fc5d46a 100644
--- a/client/src/model/PostRemoveCommentResponse.cpp
+++ b/client/src/model/PostRemoveCommentApiResponse.cpp
@@ -11,14 +11,14 @@
 
 
 
-#include "FastCommentsClient/model/PostRemoveCommentResponse.h"
+#include "FastCommentsClient/model/PostRemoveCommentApiResponse.h"
 
 namespace org {
 namespace openapitools {
 namespace client {
 namespace model {
 
-PostRemoveCommentResponse::PostRemoveCommentResponse()
+PostRemoveCommentApiResponse::PostRemoveCommentApiResponse()
 {
     m_Action = utility::conversions::to_string_t("");
     m_ActionIsSet = false;
@@ -26,16 +26,16 @@ PostRemoveCommentResponse::PostRemoveCommentResponse()
     m_StatusIsSet = false;
 }
 
-PostRemoveCommentResponse::~PostRemoveCommentResponse()
+PostRemoveCommentApiResponse::~PostRemoveCommentApiResponse()
 {
 }
 
-void PostRemoveCommentResponse::validate()
+void PostRemoveCommentApiResponse::validate()
 {
     // TODO: implement validation
 }
 
-web::json::value PostRemoveCommentResponse::toJson() const
+web::json::value PostRemoveCommentApiResponse::toJson() const
 {
     web::json::value val = web::json::value::object();
     if(m_ActionIsSet)
@@ -52,7 +52,7 @@ web::json::value PostRemoveCommentResponse::toJson() const
     return val;
 }
 
-bool PostRemoveCommentResponse::fromJson(const web::json::value& val)
+bool PostRemoveCommentApiResponse::fromJson(const web::json::value& val)
 {
     bool ok = true;
     if(val.has_field(utility::conversions::to_string_t(_XPLATSTR("action"))))
@@ -80,7 +80,7 @@ bool PostRemoveCommentResponse::fromJson(const web::json::value& val)
     return ok;
 }
 
-void PostRemoveCommentResponse::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
+void PostRemoveCommentApiResponse::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
 {
     utility::string_t namePrefix = prefix;
     if(namePrefix.size() > 0 && namePrefix.substr(namePrefix.size() - 1) != utility::conversions::to_string_t(_XPLATSTR(".")))
@@ -97,7 +97,7 @@ void PostRemoveCommentResponse::toMultipart(std::shared_ptr<MultipartFormData> m
     }
 }
 
-bool PostRemoveCommentResponse::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
+bool PostRemoveCommentApiResponse::fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix)
 {
     bool ok = true;
     utility::string_t namePrefix = prefix;
@@ -122,45 +122,45 @@ bool PostRemoveCommentResponse::fromMultiPart(std::shared_ptr<MultipartFormData>
 }
 
 
-utility::string_t PostRemoveCommentResponse::getAction() const
+utility::string_t PostRemoveCommentApiResponse::getAction() const
 {
     return m_Action;
 }
 
 
-void PostRemoveCommentResponse::setAction(const utility::string_t& value)
+void PostRemoveCommentApiResponse::setAction(const utility::string_t& value)
 {
     m_Action = value;
     m_ActionIsSet = true;
 }
 
-bool PostRemoveCommentResponse::actionIsSet() const
+bool PostRemoveCommentApiResponse::actionIsSet() const
 {
     return m_ActionIsSet;
 }
 
-void PostRemoveCommentResponse::unsetAction()
+void PostRemoveCommentApiResponse::unsetAction()
 {
     m_ActionIsSet = false;
 }
-utility::string_t PostRemoveCommentResponse::getStatus() const
+utility::string_t PostRemoveCommentApiResponse::getStatus() const
 {
     return m_Status;
 }
 
 
-void PostRemoveCommentResponse::setStatus(const utility::string_t& value)
+void PostRemoveCommentApiResponse::setStatus(const utility::string_t& value)
 {
     m_Status = value;
     m_StatusIsSet = true;
 }
 
-bool PostRemoveCommentResponse::statusIsSet() const
+bool PostRemoveCommentApiResponse::statusIsSet() const
 {
     return m_StatusIsSet;
 }
 
-void PostRemoveCommentResponse::unsetStatus()
+void PostRemoveCommentApiResponse::unsetStatus()
 {
     m_StatusIsSet = false;
 }
diff --git a/config.json b/config.json
index 18de350..d49ffbb 100644
--- a/config.json
+++ b/config.json
@@ -1,4 +1,5 @@
 {
   "packageName": "FastCommentsClient",
-  "packageVersion": "2.0.1"
+  "packageVersion": "3.0.0",
+  "useSingleRequestParameter": true
 }
diff --git a/docs/Apis/DefaultApi.md b/docs/Apis/DefaultApi.md
index 899940e..8d14a27 100644
--- a/docs/Apis/DefaultApi.md
+++ b/docs/Apis/DefaultApi.md
@@ -156,7 +156,7 @@ All URIs are relative to *https://fastcomments.com*
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **tenantId** | **String**|  | [optional] [default to null] |
+| **tenantId** | **String**|  | [default to null] |
 | **CreateHashTagBody** | [**CreateHashTagBody**](../Models/CreateHashTagBody.md)|  | [optional] |
 
 ### Return type
@@ -182,7 +182,7 @@ All URIs are relative to *https://fastcomments.com*
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **tenantId** | **String**|  | [optional] [default to null] |
+| **tenantId** | **String**|  | [default to null] |
 | **BulkCreateHashTagsBody** | [**BulkCreateHashTagsBody**](../Models/BulkCreateHashTagsBody.md)|  | [optional] |
 
 ### Return type
@@ -857,7 +857,7 @@ All URIs are relative to *https://fastcomments.com*
 
 <a name="deleteHashTag"></a>
 # **deleteHashTag**
-> APIEmptyResponse deleteHashTag(tag, tenantId, DeleteHashTagRequestBody)
+> APIEmptyResponse deleteHashTag(tenantId, tag, DeleteHashTagRequestBody)
 
 
 
@@ -865,8 +865,8 @@ All URIs are relative to *https://fastcomments.com*
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **tag** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **DeleteHashTagRequestBody** | [**DeleteHashTagRequestBody**](../Models/DeleteHashTagRequestBody.md)|  | [optional] |
 
 ### Return type
@@ -2518,7 +2518,7 @@ All URIs are relative to *https://fastcomments.com*
 
 <a name="patchHashTag"></a>
 # **patchHashTag**
-> UpdateHashTagResponse patchHashTag(tag, tenantId, UpdateHashTagBody)
+> UpdateHashTagResponse patchHashTag(tenantId, tag, UpdateHashTagBody)
 
 
 
@@ -2526,8 +2526,8 @@ All URIs are relative to *https://fastcomments.com*
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **tag** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **UpdateHashTagBody** | [**UpdateHashTagBody**](../Models/UpdateHashTagBody.md)|  | [optional] |
 
 ### Return type
diff --git a/docs/Apis/ModerationApi.md b/docs/Apis/ModerationApi.md
index 9c47205..809ef44 100644
--- a/docs/Apis/ModerationApi.md
+++ b/docs/Apis/ModerationApi.md
@@ -4,54 +4,54 @@ 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 |  |
 
 
 <a name="deleteModerationVote"></a>
 # **deleteModerationVote**
-> VoteDeleteResponse deleteModerationVote(commentId, voteId, broadcastId, tenantId, sso)
+> VoteDeleteResponse deleteModerationVote(tenantId, commentId, voteId, broadcastId, sso)
 
 
 
@@ -59,10 +59,10 @@ All URIs are relative to *https://fastcomments.com*
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **voteId** | **String**|  | [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -80,7 +80,7 @@ No authorization required
 
 <a name="getApiComments"></a>
 # **getApiComments**
-> ModerationAPIGetCommentsResponse getApiComments(page, count, text-search, byIPFromComment, filters, searchFilters, sorts, demo, tenantId, sso)
+> ModerationAPIGetCommentsResponse getApiComments(tenantId, page, count, text-search, byIPFromComment, filters, searchFilters, sorts, demo, sso)
 
 
 
@@ -88,6 +88,7 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **page** | **Double**|  | [optional] [default to null] |
 | **count** | **Double**|  | [optional] [default to null] |
 | **text-search** | **String**|  | [optional] [default to null] |
@@ -96,7 +97,6 @@ No authorization required
 | **searchFilters** | **String**|  | [optional] [default to null] |
 | **sorts** | **String**|  | [optional] [default to null] |
 | **demo** | **Boolean**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -114,7 +114,7 @@ No authorization required
 
 <a name="getApiExportStatus"></a>
 # **getApiExportStatus**
-> ModerationExportStatusResponse getApiExportStatus(batchJobId, tenantId, sso)
+> ModerationExportStatusResponse getApiExportStatus(tenantId, batchJobId, sso)
 
 
 
@@ -122,8 +122,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **batchJobId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -141,7 +141,7 @@ No authorization required
 
 <a name="getApiIds"></a>
 # **getApiIds**
-> ModerationAPIGetCommentIdsResponse getApiIds(text-search, byIPFromComment, filters, searchFilters, afterId, demo, tenantId, sso)
+> ModerationAPIGetCommentIdsResponse getApiIds(tenantId, text-search, byIPFromComment, filters, searchFilters, afterId, demo, sso)
 
 
 
@@ -149,13 +149,13 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **text-search** | **String**|  | [optional] [default to null] |
 | **byIPFromComment** | **String**|  | [optional] [default to null] |
 | **filters** | **String**|  | [optional] [default to null] |
 | **searchFilters** | **String**|  | [optional] [default to null] |
 | **afterId** | **String**|  | [optional] [default to null] |
 | **demo** | **Boolean**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -173,7 +173,7 @@ No authorization required
 
 <a name="getBanUsersFromComment"></a>
 # **getBanUsersFromComment**
-> GetBannedUsersFromCommentResponse getBanUsersFromComment(commentId, tenantId, sso)
+> GetBannedUsersFromCommentResponse getBanUsersFromComment(tenantId, commentId, sso)
 
 
 
@@ -181,8 +181,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -200,7 +200,7 @@ No authorization required
 
 <a name="getCommentBanStatus"></a>
 # **getCommentBanStatus**
-> GetCommentBanStatusResponse getCommentBanStatus(commentId, tenantId, sso)
+> GetCommentBanStatusResponse getCommentBanStatus(tenantId, commentId, sso)
 
 
 
@@ -208,8 +208,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -227,7 +227,7 @@ No authorization required
 
 <a name="getCommentChildren"></a>
 # **getCommentChildren**
-> ModerationAPIChildCommentsResponse getCommentChildren(commentId, tenantId, sso)
+> ModerationAPIChildCommentsResponse getCommentChildren(tenantId, commentId, sso)
 
 
 
@@ -235,8 +235,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -254,7 +254,7 @@ No authorization required
 
 <a name="getCount"></a>
 # **getCount**
-> ModerationAPICountCommentsResponse getCount(text-search, byIPFromComment, filter, searchFilters, demo, tenantId, sso)
+> ModerationAPICountCommentsResponse getCount(tenantId, text-search, byIPFromComment, filter, searchFilters, demo, sso)
 
 
 
@@ -262,12 +262,12 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **text-search** | **String**|  | [optional] [default to null] |
 | **byIPFromComment** | **String**|  | [optional] [default to null] |
 | **filter** | **String**|  | [optional] [default to null] |
 | **searchFilters** | **String**|  | [optional] [default to null] |
 | **demo** | **Boolean**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -293,7 +293,7 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **tenantId** | **String**|  | [optional] [default to null] |
+| **tenantId** | **String**|  | [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -311,7 +311,7 @@ No authorization required
 
 <a name="getLogs"></a>
 # **getLogs**
-> ModerationAPIGetLogsResponse getLogs(commentId, tenantId, sso)
+> ModerationAPIGetLogsResponse getLogs(tenantId, commentId, sso)
 
 
 
@@ -319,8 +319,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -346,7 +346,7 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **tenantId** | **String**|  | [optional] [default to null] |
+| **tenantId** | **String**|  | [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -364,7 +364,7 @@ No authorization required
 
 <a name="getManualBadgesForUser"></a>
 # **getManualBadgesForUser**
-> GetUserManualBadgesResponse getManualBadgesForUser(badgesUserId, commentId, tenantId, sso)
+> GetUserManualBadgesResponse getManualBadgesForUser(tenantId, badgesUserId, commentId, sso)
 
 
 
@@ -372,9 +372,9 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **badgesUserId** | **String**|  | [optional] [default to null] |
 | **commentId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -392,7 +392,7 @@ No authorization required
 
 <a name="getModerationComment"></a>
 # **getModerationComment**
-> ModerationAPICommentResponse getModerationComment(commentId, includeEmail, includeIP, tenantId, sso)
+> ModerationAPICommentResponse getModerationComment(tenantId, commentId, includeEmail, includeIP, sso)
 
 
 
@@ -400,10 +400,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **includeEmail** | **Boolean**|  | [optional] [default to null] |
 | **includeIP** | **Boolean**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -421,7 +421,7 @@ No authorization required
 
 <a name="getModerationCommentText"></a>
 # **getModerationCommentText**
-> GetCommentTextResponse getModerationCommentText(commentId, tenantId, sso)
+> GetCommentTextResponse getModerationCommentText(tenantId, commentId, sso)
 
 
 
@@ -429,8 +429,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -448,7 +448,7 @@ No authorization required
 
 <a name="getPreBanSummary"></a>
 # **getPreBanSummary**
-> PreBanSummary getPreBanSummary(commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso)
+> PreBanSummary getPreBanSummary(tenantId, commentId, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, sso)
 
 
 
@@ -456,11 +456,11 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **includeByUserIdAndEmail** | **Boolean**|  | [optional] [default to null] |
 | **includeByIP** | **Boolean**|  | [optional] [default to null] |
 | **includeByEmailDomain** | **Boolean**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -478,7 +478,7 @@ No authorization required
 
 <a name="getSearchCommentsSummary"></a>
 # **getSearchCommentsSummary**
-> ModerationCommentSearchResponse getSearchCommentsSummary(value, filters, searchFilters, tenantId, sso)
+> ModerationCommentSearchResponse getSearchCommentsSummary(tenantId, value, filters, searchFilters, sso)
 
 
 
@@ -486,10 +486,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **value** | **String**|  | [optional] [default to null] |
 | **filters** | **String**|  | [optional] [default to null] |
 | **searchFilters** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -507,7 +507,7 @@ No authorization required
 
 <a name="getSearchPages"></a>
 # **getSearchPages**
-> ModerationPageSearchResponse getSearchPages(value, tenantId, sso)
+> ModerationPageSearchResponse getSearchPages(tenantId, value, sso)
 
 
 
@@ -515,8 +515,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **value** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -534,7 +534,7 @@ No authorization required
 
 <a name="getSearchSites"></a>
 # **getSearchSites**
-> ModerationSiteSearchResponse getSearchSites(value, tenantId, sso)
+> ModerationSiteSearchResponse getSearchSites(tenantId, value, sso)
 
 
 
@@ -542,8 +542,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **value** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -561,7 +561,7 @@ No authorization required
 
 <a name="getSearchSuggest"></a>
 # **getSearchSuggest**
-> ModerationSuggestResponse getSearchSuggest(text-search, tenantId, sso)
+> ModerationSuggestResponse getSearchSuggest(tenantId, text-search, sso)
 
 
 
@@ -569,8 +569,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **text-search** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -588,7 +588,7 @@ No authorization required
 
 <a name="getSearchUsers"></a>
 # **getSearchUsers**
-> ModerationUserSearchResponse getSearchUsers(value, tenantId, sso)
+> ModerationUserSearchResponse getSearchUsers(tenantId, value, sso)
 
 
 
@@ -596,8 +596,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **value** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -615,7 +615,7 @@ No authorization required
 
 <a name="getTrustFactor"></a>
 # **getTrustFactor**
-> GetUserTrustFactorResponse getTrustFactor(userId, tenantId, sso)
+> GetUserTrustFactorResponse getTrustFactor(tenantId, userId, sso)
 
 
 
@@ -623,8 +623,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **userId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -650,7 +650,7 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **tenantId** | **String**|  | [optional] [default to null] |
+| **tenantId** | **String**|  | [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -668,7 +668,7 @@ No authorization required
 
 <a name="getUserInternalProfile"></a>
 # **getUserInternalProfile**
-> GetUserInternalProfileResponse getUserInternalProfile(commentId, tenantId, sso)
+> GetUserInternalProfileResponse getUserInternalProfile(tenantId, commentId, sso)
 
 
 
@@ -676,8 +676,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -695,7 +695,7 @@ No authorization required
 
 <a name="postAdjustCommentVotes"></a>
 # **postAdjustCommentVotes**
-> AdjustVotesResponse postAdjustCommentVotes(commentId, AdjustCommentVotesParams, broadcastId, tenantId, sso)
+> AdjustVotesResponse postAdjustCommentVotes(tenantId, commentId, AdjustCommentVotesParams, broadcastId, sso)
 
 
 
@@ -703,10 +703,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **AdjustCommentVotesParams** | [**AdjustCommentVotesParams**](../Models/AdjustCommentVotesParams.md)|  | |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -724,7 +724,7 @@ No authorization required
 
 <a name="postApiExport"></a>
 # **postApiExport**
-> ModerationExportResponse postApiExport(text-search, byIPFromComment, filters, searchFilters, sorts, tenantId, sso)
+> ModerationExportResponse postApiExport(tenantId, text-search, byIPFromComment, filters, searchFilters, sorts, sso)
 
 
 
@@ -732,12 +732,12 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **text-search** | **String**|  | [optional] [default to null] |
 | **byIPFromComment** | **String**|  | [optional] [default to null] |
 | **filters** | **String**|  | [optional] [default to null] |
 | **searchFilters** | **String**|  | [optional] [default to null] |
 | **sorts** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -755,7 +755,7 @@ No authorization required
 
 <a name="postBanUserFromComment"></a>
 # **postBanUserFromComment**
-> BanUserFromCommentResult postBanUserFromComment(commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, tenantId, sso)
+> BanUserFromCommentResult postBanUserFromComment(tenantId, commentId, banEmail, banEmailDomain, banIP, deleteAllUsersComments, bannedUntil, isShadowBan, updateId, banReason, sso)
 
 
 
@@ -763,6 +763,7 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **banEmail** | **Boolean**|  | [optional] [default to null] |
 | **banEmailDomain** | **Boolean**|  | [optional] [default to null] |
@@ -772,7 +773,6 @@ No authorization required
 | **isShadowBan** | **Boolean**|  | [optional] [default to null] |
 | **updateId** | **String**|  | [optional] [default to null] |
 | **banReason** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -790,7 +790,7 @@ No authorization required
 
 <a name="postBanUserUndo"></a>
 # **postBanUserUndo**
-> APIEmptyResponse postBanUserUndo(BanUserUndoParams, tenantId, sso)
+> APIEmptyResponse postBanUserUndo(tenantId, BanUserUndoParams, sso)
 
 
 
@@ -798,8 +798,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **BanUserUndoParams** | [**BanUserUndoParams**](../Models/BanUserUndoParams.md)|  | |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -817,7 +817,7 @@ No authorization required
 
 <a name="postBulkPreBanSummary"></a>
 # **postBulkPreBanSummary**
-> BulkPreBanSummary postBulkPreBanSummary(BulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, tenantId, sso)
+> BulkPreBanSummary postBulkPreBanSummary(tenantId, BulkPreBanParams, includeByUserIdAndEmail, includeByIP, includeByEmailDomain, sso)
 
 
 
@@ -825,11 +825,11 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **BulkPreBanParams** | [**BulkPreBanParams**](../Models/BulkPreBanParams.md)|  | |
 | **includeByUserIdAndEmail** | **Boolean**|  | [optional] [default to null] |
 | **includeByIP** | **Boolean**|  | [optional] [default to null] |
 | **includeByEmailDomain** | **Boolean**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -847,7 +847,7 @@ No authorization required
 
 <a name="postCommentsByIds"></a>
 # **postCommentsByIds**
-> ModerationAPIChildCommentsResponse postCommentsByIds(CommentsByIdsParams, tenantId, sso)
+> ModerationAPIChildCommentsResponse postCommentsByIds(tenantId, CommentsByIdsParams, sso)
 
 
 
@@ -855,8 +855,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **CommentsByIdsParams** | [**CommentsByIdsParams**](../Models/CommentsByIdsParams.md)|  | |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -874,7 +874,7 @@ No authorization required
 
 <a name="postFlagComment"></a>
 # **postFlagComment**
-> APIEmptyResponse postFlagComment(commentId, broadcastId, tenantId, sso)
+> APIEmptyResponse postFlagComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -882,9 +882,9 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -902,7 +902,7 @@ No authorization required
 
 <a name="postRemoveComment"></a>
 # **postRemoveComment**
-> PostRemoveCommentResponse postRemoveComment(commentId, broadcastId, tenantId, sso)
+> PostRemoveCommentApiResponse postRemoveComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -910,14 +910,14 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
 
-[**PostRemoveCommentResponse**](../Models/PostRemoveCommentResponse.md)
+[**PostRemoveCommentApiResponse**](../Models/PostRemoveCommentApiResponse.md)
 
 ### Authorization
 
@@ -930,7 +930,7 @@ No authorization required
 
 <a name="postRestoreDeletedComment"></a>
 # **postRestoreDeletedComment**
-> APIEmptyResponse postRestoreDeletedComment(commentId, broadcastId, tenantId, sso)
+> APIEmptyResponse postRestoreDeletedComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -938,9 +938,9 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -958,7 +958,7 @@ No authorization required
 
 <a name="postSetCommentApprovalStatus"></a>
 # **postSetCommentApprovalStatus**
-> SetCommentApprovedResponse postSetCommentApprovalStatus(commentId, approved, broadcastId, tenantId, sso)
+> SetCommentApprovedResponse postSetCommentApprovalStatus(tenantId, commentId, approved, broadcastId, sso)
 
 
 
@@ -966,10 +966,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **approved** | **Boolean**|  | [optional] [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -987,7 +987,7 @@ No authorization required
 
 <a name="postSetCommentReviewStatus"></a>
 # **postSetCommentReviewStatus**
-> APIEmptyResponse postSetCommentReviewStatus(commentId, reviewed, broadcastId, tenantId, sso)
+> APIEmptyResponse postSetCommentReviewStatus(tenantId, commentId, reviewed, broadcastId, sso)
 
 
 
@@ -995,10 +995,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **reviewed** | **Boolean**|  | [optional] [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1016,7 +1016,7 @@ No authorization required
 
 <a name="postSetCommentSpamStatus"></a>
 # **postSetCommentSpamStatus**
-> APIEmptyResponse postSetCommentSpamStatus(commentId, spam, permNotSpam, broadcastId, tenantId, sso)
+> APIEmptyResponse postSetCommentSpamStatus(tenantId, commentId, spam, permNotSpam, broadcastId, sso)
 
 
 
@@ -1024,11 +1024,11 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **spam** | **Boolean**|  | [optional] [default to null] |
 | **permNotSpam** | **Boolean**|  | [optional] [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1046,7 +1046,7 @@ No authorization required
 
 <a name="postSetCommentText"></a>
 # **postSetCommentText**
-> SetCommentTextResponse postSetCommentText(commentId, SetCommentTextParams, broadcastId, tenantId, sso)
+> SetCommentTextResponse postSetCommentText(tenantId, commentId, SetCommentTextParams, broadcastId, sso)
 
 
 
@@ -1054,10 +1054,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **SetCommentTextParams** | [**SetCommentTextParams**](../Models/SetCommentTextParams.md)|  | |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1075,7 +1075,7 @@ No authorization required
 
 <a name="postUnFlagComment"></a>
 # **postUnFlagComment**
-> APIEmptyResponse postUnFlagComment(commentId, broadcastId, tenantId, sso)
+> APIEmptyResponse postUnFlagComment(tenantId, commentId, broadcastId, sso)
 
 
 
@@ -1083,9 +1083,9 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1103,7 +1103,7 @@ No authorization required
 
 <a name="postVote"></a>
 # **postVote**
-> VoteResponse postVote(commentId, direction, broadcastId, tenantId, sso)
+> VoteResponse postVote(tenantId, commentId, direction, broadcastId, sso)
 
 
 
@@ -1111,10 +1111,10 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **commentId** | **String**|  | [default to null] |
 | **direction** | **String**|  | [optional] [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1132,7 +1132,7 @@ No authorization required
 
 <a name="putAwardBadge"></a>
 # **putAwardBadge**
-> AwardUserBadgeResponse putAwardBadge(badgeId, userId, commentId, broadcastId, tenantId, sso)
+> AwardUserBadgeResponse putAwardBadge(tenantId, badgeId, userId, commentId, broadcastId, sso)
 
 
 
@@ -1140,11 +1140,11 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **badgeId** | **String**|  | [default to null] |
 | **userId** | **String**|  | [optional] [default to null] |
 | **commentId** | **String**|  | [optional] [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1162,7 +1162,7 @@ No authorization required
 
 <a name="putCloseThread"></a>
 # **putCloseThread**
-> APIEmptyResponse putCloseThread(urlId, tenantId, sso)
+> APIEmptyResponse putCloseThread(tenantId, urlId, sso)
 
 
 
@@ -1170,8 +1170,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **urlId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1189,7 +1189,7 @@ No authorization required
 
 <a name="putRemoveBadge"></a>
 # **putRemoveBadge**
-> RemoveUserBadgeResponse putRemoveBadge(badgeId, userId, commentId, broadcastId, tenantId, sso)
+> RemoveUserBadgeResponse putRemoveBadge(tenantId, badgeId, userId, commentId, broadcastId, sso)
 
 
 
@@ -1197,11 +1197,11 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **badgeId** | **String**|  | [default to null] |
 | **userId** | **String**|  | [optional] [default to null] |
 | **commentId** | **String**|  | [optional] [default to null] |
 | **broadcastId** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1219,7 +1219,7 @@ No authorization required
 
 <a name="putReopenThread"></a>
 # **putReopenThread**
-> APIEmptyResponse putReopenThread(urlId, tenantId, sso)
+> APIEmptyResponse putReopenThread(tenantId, urlId, sso)
 
 
 
@@ -1227,8 +1227,8 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **urlId** | **String**|  | [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
@@ -1246,7 +1246,7 @@ No authorization required
 
 <a name="setTrustFactor"></a>
 # **setTrustFactor**
-> SetUserTrustFactorResponse setTrustFactor(userId, trustFactor, tenantId, sso)
+> SetUserTrustFactorResponse setTrustFactor(tenantId, userId, trustFactor, sso)
 
 
 
@@ -1254,9 +1254,9 @@ No authorization required
 
 |Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
+| **tenantId** | **String**|  | [default to null] |
 | **userId** | **String**|  | [optional] [default to null] |
 | **trustFactor** | **String**|  | [optional] [default to null] |
-| **tenantId** | **String**|  | [optional] [default to null] |
 | **sso** | **String**|  | [optional] [default to null] |
 
 ### Return type
diff --git a/docs/Models/PostRemoveCommentResponse.md b/docs/Models/PostRemoveCommentApiResponse.md
similarity index 92%
rename from docs/Models/PostRemoveCommentResponse.md
rename to docs/Models/PostRemoveCommentApiResponse.md
index 057e54b..a0942ee 100644
--- a/docs/Models/PostRemoveCommentResponse.md
+++ b/docs/Models/PostRemoveCommentApiResponse.md
@@ -1,4 +1,4 @@
-# PostRemoveCommentResponse
+# PostRemoveCommentApiResponse
 ## Properties
 
 | Name | Type | Description | Notes |
diff --git a/docs/README.md b/docs/README.md
index c923b37..940707b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -121,49 +121,49 @@ All URIs are relative to *https://fastcomments.com*
 *DefaultApi* | [**updateTenantPackage**](Apis/DefaultApi.md#updateTenantPackage) | **PATCH** /api/v1/tenant-packages/{id} |  |
 *DefaultApi* | [**updateTenantUser**](Apis/DefaultApi.md#updateTenantUser) | **PATCH** /api/v1/tenant-users/{id} |  |
 *DefaultApi* | [**updateUserBadge**](Apis/DefaultApi.md#updateUserBadge) | **PUT** /api/v1/user-badges/{id} |  |
-| *ModerationApi* | [**deleteModerationVote**](Apis/ModerationApi.md#deleteModerationVote) | **DELETE** /auth/my-account/moderate-comments/vote/{commentId}/{voteId} |  |
-*ModerationApi* | [**getApiComments**](Apis/ModerationApi.md#getApiComments) | **GET** /auth/my-account/moderate-comments/api/comments |  |
-*ModerationApi* | [**getApiExportStatus**](Apis/ModerationApi.md#getApiExportStatus) | **GET** /auth/my-account/moderate-comments/api/export/status |  |
-*ModerationApi* | [**getApiIds**](Apis/ModerationApi.md#getApiIds) | **GET** /auth/my-account/moderate-comments/api/ids |  |
-*ModerationApi* | [**getBanUsersFromComment**](Apis/ModerationApi.md#getBanUsersFromComment) | **GET** /auth/my-account/moderate-comments/ban-users/from-comment/{commentId} |  |
-*ModerationApi* | [**getCommentBanStatus**](Apis/ModerationApi.md#getCommentBanStatus) | **GET** /auth/my-account/moderate-comments/get-comment-ban-status/{commentId} |  |
-*ModerationApi* | [**getCommentChildren**](Apis/ModerationApi.md#getCommentChildren) | **GET** /auth/my-account/moderate-comments/comment-children/{commentId} |  |
-*ModerationApi* | [**getCount**](Apis/ModerationApi.md#getCount) | **GET** /auth/my-account/moderate-comments/count |  |
-*ModerationApi* | [**getCounts**](Apis/ModerationApi.md#getCounts) | **GET** /auth/my-account/moderate-comments/banned-users/counts |  |
-*ModerationApi* | [**getLogs**](Apis/ModerationApi.md#getLogs) | **GET** /auth/my-account/moderate-comments/logs/{commentId} |  |
-*ModerationApi* | [**getManualBadges**](Apis/ModerationApi.md#getManualBadges) | **GET** /auth/my-account/moderate-comments/get-manual-badges |  |
-*ModerationApi* | [**getManualBadgesForUser**](Apis/ModerationApi.md#getManualBadgesForUser) | **GET** /auth/my-account/moderate-comments/get-manual-badges-for-user |  |
-*ModerationApi* | [**getModerationComment**](Apis/ModerationApi.md#getModerationComment) | **GET** /auth/my-account/moderate-comments/comment/{commentId} |  |
-*ModerationApi* | [**getModerationCommentText**](Apis/ModerationApi.md#getModerationCommentText) | **GET** /auth/my-account/moderate-comments/get-comment-text/{commentId} |  |
-*ModerationApi* | [**getPreBanSummary**](Apis/ModerationApi.md#getPreBanSummary) | **GET** /auth/my-account/moderate-comments/pre-ban-summary/{commentId} |  |
-*ModerationApi* | [**getSearchCommentsSummary**](Apis/ModerationApi.md#getSearchCommentsSummary) | **GET** /auth/my-account/moderate-comments/search/comments/summary |  |
-*ModerationApi* | [**getSearchPages**](Apis/ModerationApi.md#getSearchPages) | **GET** /auth/my-account/moderate-comments/search/pages |  |
-*ModerationApi* | [**getSearchSites**](Apis/ModerationApi.md#getSearchSites) | **GET** /auth/my-account/moderate-comments/search/sites |  |
-*ModerationApi* | [**getSearchSuggest**](Apis/ModerationApi.md#getSearchSuggest) | **GET** /auth/my-account/moderate-comments/search/suggest |  |
-*ModerationApi* | [**getSearchUsers**](Apis/ModerationApi.md#getSearchUsers) | **GET** /auth/my-account/moderate-comments/search/users |  |
-*ModerationApi* | [**getTrustFactor**](Apis/ModerationApi.md#getTrustFactor) | **GET** /auth/my-account/moderate-comments/get-trust-factor |  |
-*ModerationApi* | [**getUserBanPreference**](Apis/ModerationApi.md#getUserBanPreference) | **GET** /auth/my-account/moderate-comments/user-ban-preference |  |
-*ModerationApi* | [**getUserInternalProfile**](Apis/ModerationApi.md#getUserInternalProfile) | **GET** /auth/my-account/moderate-comments/get-user-internal-profile |  |
-*ModerationApi* | [**postAdjustCommentVotes**](Apis/ModerationApi.md#postAdjustCommentVotes) | **POST** /auth/my-account/moderate-comments/adjust-comment-votes/{commentId} |  |
-*ModerationApi* | [**postApiExport**](Apis/ModerationApi.md#postApiExport) | **POST** /auth/my-account/moderate-comments/api/export |  |
-*ModerationApi* | [**postBanUserFromComment**](Apis/ModerationApi.md#postBanUserFromComment) | **POST** /auth/my-account/moderate-comments/ban-user/from-comment/{commentId} |  |
-*ModerationApi* | [**postBanUserUndo**](Apis/ModerationApi.md#postBanUserUndo) | **POST** /auth/my-account/moderate-comments/ban-user/undo |  |
-*ModerationApi* | [**postBulkPreBanSummary**](Apis/ModerationApi.md#postBulkPreBanSummary) | **POST** /auth/my-account/moderate-comments/bulk-pre-ban-summary |  |
-*ModerationApi* | [**postCommentsByIds**](Apis/ModerationApi.md#postCommentsByIds) | **POST** /auth/my-account/moderate-comments/comments-by-ids |  |
-*ModerationApi* | [**postFlagComment**](Apis/ModerationApi.md#postFlagComment) | **POST** /auth/my-account/moderate-comments/flag-comment/{commentId} |  |
-*ModerationApi* | [**postRemoveComment**](Apis/ModerationApi.md#postRemoveComment) | **POST** /auth/my-account/moderate-comments/remove-comment/{commentId} |  |
-*ModerationApi* | [**postRestoreDeletedComment**](Apis/ModerationApi.md#postRestoreDeletedComment) | **POST** /auth/my-account/moderate-comments/restore-deleted-comment/{commentId} |  |
-*ModerationApi* | [**postSetCommentApprovalStatus**](Apis/ModerationApi.md#postSetCommentApprovalStatus) | **POST** /auth/my-account/moderate-comments/set-comment-approval-status/{commentId} |  |
-*ModerationApi* | [**postSetCommentReviewStatus**](Apis/ModerationApi.md#postSetCommentReviewStatus) | **POST** /auth/my-account/moderate-comments/set-comment-review-status/{commentId} |  |
-*ModerationApi* | [**postSetCommentSpamStatus**](Apis/ModerationApi.md#postSetCommentSpamStatus) | **POST** /auth/my-account/moderate-comments/set-comment-spam-status/{commentId} |  |
-*ModerationApi* | [**postSetCommentText**](Apis/ModerationApi.md#postSetCommentText) | **POST** /auth/my-account/moderate-comments/set-comment-text/{commentId} |  |
-*ModerationApi* | [**postUnFlagComment**](Apis/ModerationApi.md#postUnFlagComment) | **POST** /auth/my-account/moderate-comments/un-flag-comment/{commentId} |  |
-*ModerationApi* | [**postVote**](Apis/ModerationApi.md#postVote) | **POST** /auth/my-account/moderate-comments/vote/{commentId} |  |
-*ModerationApi* | [**putAwardBadge**](Apis/ModerationApi.md#putAwardBadge) | **PUT** /auth/my-account/moderate-comments/award-badge |  |
-*ModerationApi* | [**putCloseThread**](Apis/ModerationApi.md#putCloseThread) | **PUT** /auth/my-account/moderate-comments/close-thread |  |
-*ModerationApi* | [**putRemoveBadge**](Apis/ModerationApi.md#putRemoveBadge) | **PUT** /auth/my-account/moderate-comments/remove-badge |  |
-*ModerationApi* | [**putReopenThread**](Apis/ModerationApi.md#putReopenThread) | **PUT** /auth/my-account/moderate-comments/reopen-thread |  |
-*ModerationApi* | [**setTrustFactor**](Apis/ModerationApi.md#setTrustFactor) | **PUT** /auth/my-account/moderate-comments/set-trust-factor |  |
+| *ModerationApi* | [**deleteModerationVote**](Apis/ModerationApi.md#deleteModerationVote) | **DELETE** /auth/my-account/moderate-comments/mod_api/vote/{commentId}/{voteId} |  |
+*ModerationApi* | [**getApiComments**](Apis/ModerationApi.md#getApiComments) | **GET** /auth/my-account/moderate-comments/mod_api/api/comments |  |
+*ModerationApi* | [**getApiExportStatus**](Apis/ModerationApi.md#getApiExportStatus) | **GET** /auth/my-account/moderate-comments/mod_api/api/export/status |  |
+*ModerationApi* | [**getApiIds**](Apis/ModerationApi.md#getApiIds) | **GET** /auth/my-account/moderate-comments/mod_api/api/ids |  |
+*ModerationApi* | [**getBanUsersFromComment**](Apis/ModerationApi.md#getBanUsersFromComment) | **GET** /auth/my-account/moderate-comments/mod_api/ban-users/from-comment/{commentId} |  |
+*ModerationApi* | [**getCommentBanStatus**](Apis/ModerationApi.md#getCommentBanStatus) | **GET** /auth/my-account/moderate-comments/mod_api/get-comment-ban-status/{commentId} |  |
+*ModerationApi* | [**getCommentChildren**](Apis/ModerationApi.md#getCommentChildren) | **GET** /auth/my-account/moderate-comments/mod_api/comment-children/{commentId} |  |
+*ModerationApi* | [**getCount**](Apis/ModerationApi.md#getCount) | **GET** /auth/my-account/moderate-comments/mod_api/count |  |
+*ModerationApi* | [**getCounts**](Apis/ModerationApi.md#getCounts) | **GET** /auth/my-account/moderate-comments/banned-users/mod_api/counts |  |
+*ModerationApi* | [**getLogs**](Apis/ModerationApi.md#getLogs) | **GET** /auth/my-account/moderate-comments/mod_api/logs/{commentId} |  |
+*ModerationApi* | [**getManualBadges**](Apis/ModerationApi.md#getManualBadges) | **GET** /auth/my-account/moderate-comments/mod_api/get-manual-badges |  |
+*ModerationApi* | [**getManualBadgesForUser**](Apis/ModerationApi.md#getManualBadgesForUser) | **GET** /auth/my-account/moderate-comments/mod_api/get-manual-badges-for-user |  |
+*ModerationApi* | [**getModerationComment**](Apis/ModerationApi.md#getModerationComment) | **GET** /auth/my-account/moderate-comments/mod_api/comment/{commentId} |  |
+*ModerationApi* | [**getModerationCommentText**](Apis/ModerationApi.md#getModerationCommentText) | **GET** /auth/my-account/moderate-comments/mod_api/get-comment-text/{commentId} |  |
+*ModerationApi* | [**getPreBanSummary**](Apis/ModerationApi.md#getPreBanSummary) | **GET** /auth/my-account/moderate-comments/mod_api/pre-ban-summary/{commentId} |  |
+*ModerationApi* | [**getSearchCommentsSummary**](Apis/ModerationApi.md#getSearchCommentsSummary) | **GET** /auth/my-account/moderate-comments/mod_api/search/comments/summary |  |
+*ModerationApi* | [**getSearchPages**](Apis/ModerationApi.md#getSearchPages) | **GET** /auth/my-account/moderate-comments/mod_api/search/pages |  |
+*ModerationApi* | [**getSearchSites**](Apis/ModerationApi.md#getSearchSites) | **GET** /auth/my-account/moderate-comments/mod_api/search/sites |  |
+*ModerationApi* | [**getSearchSuggest**](Apis/ModerationApi.md#getSearchSuggest) | **GET** /auth/my-account/moderate-comments/mod_api/search/suggest |  |
+*ModerationApi* | [**getSearchUsers**](Apis/ModerationApi.md#getSearchUsers) | **GET** /auth/my-account/moderate-comments/mod_api/search/users |  |
+*ModerationApi* | [**getTrustFactor**](Apis/ModerationApi.md#getTrustFactor) | **GET** /auth/my-account/moderate-comments/mod_api/get-trust-factor |  |
+*ModerationApi* | [**getUserBanPreference**](Apis/ModerationApi.md#getUserBanPreference) | **GET** /auth/my-account/moderate-comments/mod_api/user-ban-preference |  |
+*ModerationApi* | [**getUserInternalProfile**](Apis/ModerationApi.md#getUserInternalProfile) | **GET** /auth/my-account/moderate-comments/mod_api/get-user-internal-profile |  |
+*ModerationApi* | [**postAdjustCommentVotes**](Apis/ModerationApi.md#postAdjustCommentVotes) | **POST** /auth/my-account/moderate-comments/mod_api/adjust-comment-votes/{commentId} |  |
+*ModerationApi* | [**postApiExport**](Apis/ModerationApi.md#postApiExport) | **POST** /auth/my-account/moderate-comments/mod_api/api/export |  |
+*ModerationApi* | [**postBanUserFromComment**](Apis/ModerationApi.md#postBanUserFromComment) | **POST** /auth/my-account/moderate-comments/mod_api/ban-user/from-comment/{commentId} |  |
+*ModerationApi* | [**postBanUserUndo**](Apis/ModerationApi.md#postBanUserUndo) | **POST** /auth/my-account/moderate-comments/mod_api/ban-user/undo |  |
+*ModerationApi* | [**postBulkPreBanSummary**](Apis/ModerationApi.md#postBulkPreBanSummary) | **POST** /auth/my-account/moderate-comments/mod_api/bulk-pre-ban-summary |  |
+*ModerationApi* | [**postCommentsByIds**](Apis/ModerationApi.md#postCommentsByIds) | **POST** /auth/my-account/moderate-comments/mod_api/comments-by-ids |  |
+*ModerationApi* | [**postFlagComment**](Apis/ModerationApi.md#postFlagComment) | **POST** /auth/my-account/moderate-comments/mod_api/flag-comment/{commentId} |  |
+*ModerationApi* | [**postRemoveComment**](Apis/ModerationApi.md#postRemoveComment) | **POST** /auth/my-account/moderate-comments/mod_api/remove-comment/{commentId} |  |
+*ModerationApi* | [**postRestoreDeletedComment**](Apis/ModerationApi.md#postRestoreDeletedComment) | **POST** /auth/my-account/moderate-comments/mod_api/restore-deleted-comment/{commentId} |  |
+*ModerationApi* | [**postSetCommentApprovalStatus**](Apis/ModerationApi.md#postSetCommentApprovalStatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-approval-status/{commentId} |  |
+*ModerationApi* | [**postSetCommentReviewStatus**](Apis/ModerationApi.md#postSetCommentReviewStatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-review-status/{commentId} |  |
+*ModerationApi* | [**postSetCommentSpamStatus**](Apis/ModerationApi.md#postSetCommentSpamStatus) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-spam-status/{commentId} |  |
+*ModerationApi* | [**postSetCommentText**](Apis/ModerationApi.md#postSetCommentText) | **POST** /auth/my-account/moderate-comments/mod_api/set-comment-text/{commentId} |  |
+*ModerationApi* | [**postUnFlagComment**](Apis/ModerationApi.md#postUnFlagComment) | **POST** /auth/my-account/moderate-comments/mod_api/un-flag-comment/{commentId} |  |
+*ModerationApi* | [**postVote**](Apis/ModerationApi.md#postVote) | **POST** /auth/my-account/moderate-comments/mod_api/vote/{commentId} |  |
+*ModerationApi* | [**putAwardBadge**](Apis/ModerationApi.md#putAwardBadge) | **PUT** /auth/my-account/moderate-comments/mod_api/award-badge |  |
+*ModerationApi* | [**putCloseThread**](Apis/ModerationApi.md#putCloseThread) | **PUT** /auth/my-account/moderate-comments/mod_api/close-thread |  |
+*ModerationApi* | [**putRemoveBadge**](Apis/ModerationApi.md#putRemoveBadge) | **PUT** /auth/my-account/moderate-comments/mod_api/remove-badge |  |
+*ModerationApi* | [**putReopenThread**](Apis/ModerationApi.md#putReopenThread) | **PUT** /auth/my-account/moderate-comments/mod_api/reopen-thread |  |
+*ModerationApi* | [**setTrustFactor**](Apis/ModerationApi.md#setTrustFactor) | **PUT** /auth/my-account/moderate-comments/mod_api/set-trust-factor |  |
 | *PublicApi* | [**blockFromCommentPublic**](Apis/PublicApi.md#blockFromCommentPublic) | **POST** /block-from-comment/{commentId} |  |
 *PublicApi* | [**checkedCommentsForBlocked**](Apis/PublicApi.md#checkedCommentsForBlocked) | **GET** /check-blocked-comments |  |
 *PublicApi* | [**createCommentPublic**](Apis/PublicApi.md#createCommentPublic) | **POST** /comments/{tenantId} |  |
@@ -480,7 +480,7 @@ All URIs are relative to *https://fastcomments.com*
  - [PatchPageAPIResponse](./Models/PatchPageAPIResponse.md)
  - [PatchSSOUserAPIResponse](./Models/PatchSSOUserAPIResponse.md)
  - [PendingCommentToSyncOutbound](./Models/PendingCommentToSyncOutbound.md)
- - [PostRemoveCommentResponse](./Models/PostRemoveCommentResponse.md)
+ - [PostRemoveCommentApiResponse](./Models/PostRemoveCommentApiResponse.md)
  - [PreBanSummary](./Models/PreBanSummary.md)
  - [PubSubComment](./Models/PubSubComment.md)
  - [PubSubCommentBase](./Models/PubSubCommentBase.md)
diff --git a/openapi.json b/openapi.json
index 0f72c9c..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,24 +14295,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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,24 +14360,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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,24 +14425,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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,24 +14490,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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",
@@ -14554,6 +14554,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "path",
 						"name": "commentId",
@@ -14578,14 +14586,6 @@
 							"type": "string"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -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",
@@ -14659,14 +14667,6 @@
 							"type": "string"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -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",
@@ -14708,6 +14708,14 @@
 				],
 				"security": [],
 				"parameters": [
+					{
+						"in": "query",
+						"name": "tenantId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"in": "path",
 						"name": "commentId",
@@ -14732,14 +14740,6 @@
 							"type": "string"
 						}
 					},
-					{
-						"in": "query",
-						"name": "tenantId",
-						"required": false,
-						"schema": {
-							"type": "string"
-						}
-					},
 					{
 						"in": "query",
 						"name": "sso",
@@ -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,24 +15085,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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,24 +15160,24 @@
 				"security": [],
 				"parameters": [
 					{
-						"in": "path",
-						"name": "commentId",
+						"in": "query",
+						"name": "tenantId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "commentId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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": "broadcastId",
+						"name": "direction",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15260,7 +15260,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"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,23 +15317,23 @@
 					},
 					{
 						"in": "path",
-						"name": "voteId",
+						"name": "commentId",
 						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
-						"in": "query",
-						"name": "broadcastId",
-						"required": false,
+						"in": "path",
+						"name": "voteId",
+						"required": true,
 						"schema": {
 							"type": "string"
 						}
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"required": false,
 						"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": "broadcastId",
+						"name": "commentId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15634,7 +15634,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"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": "broadcastId",
+						"name": "commentId",
 						"required": false,
 						"schema": {
 							"type": "string"
@@ -15715,7 +15715,7 @@
 					},
 					{
 						"in": "query",
-						"name": "tenantId",
+						"name": "broadcastId",
 						"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/tests/sso_integration_test.cpp b/tests/sso_integration_test.cpp
index 28b676b..f5e23c2 100644
--- a/tests/sso_integration_test.cpp
+++ b/tests/sso_integration_test.cpp
@@ -59,12 +59,7 @@ TEST_F(SSOIntegrationTest, PublicAPINoSSO) {
 
     auto response = publicApi.getCommentsPublic(
         utility::conversions::to_string_t(tenantID),
-        utility::conversions::to_string_t("sdk-test-page"),
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none
+        utility::conversions::to_string_t("sdk-test-page")
     ).get();
 
     ASSERT_NE(response, nullptr);
@@ -98,26 +93,26 @@ TEST_F(SSOIntegrationTest, PublicAPIWithSecureSSO) {
     commentData->setCommenterName(utility::conversions::to_string_t(user.username));
     commentData->setDate(timestamp);
 
+    CreateCommentPublicOptions createOpts;
+    createOpts.sso = utility::conversions::to_string_t(token);
+
     auto createResponse = publicApi.createCommentPublic(
         utility::conversions::to_string_t(tenantID),
         utility::conversions::to_string_t("sdk-test-cpp"),
         utility::conversions::to_string_t("test-" + std::to_string(timestamp)),
         commentData,
-        boost::none,
-        utility::conversions::to_string_t(token)
+        createOpts
     ).get();
 
     ASSERT_NE(createResponse, nullptr);
 
+    GetCommentsPublicOptions getOpts;
+    getOpts.sso = utility::conversions::to_string_t(token);
+
     auto getResponse = publicApi.getCommentsPublic(
         utility::conversions::to_string_t(tenantID),
         utility::conversions::to_string_t("sdk-test-cpp"),
-        boost::none, boost::none,
-        utility::conversions::to_string_t(token),
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none
+        getOpts
     ).get();
 
     ASSERT_NE(getResponse, nullptr);
@@ -155,13 +150,15 @@ TEST_F(SSOIntegrationTest, DefaultAPIWithAPIKey) {
     commentData->setCommenterName(utility::conversions::to_string_t(user.username));
     commentData->setDate(timestamp);
 
+    CreateCommentPublicOptions createOpts;
+    createOpts.sso = utility::conversions::to_string_t(token);
+
     auto createResponse = publicApi.createCommentPublic(
         utility::conversions::to_string_t(tenantID),
         utility::conversions::to_string_t(testUrlId),
         utility::conversions::to_string_t("test-" + std::to_string(timestamp)),
         commentData,
-        boost::none,
-        utility::conversions::to_string_t(token)
+        createOpts
     ).get();
 
     ASSERT_NE(createResponse, nullptr);
@@ -177,24 +174,12 @@ TEST_F(SSOIntegrationTest, DefaultAPIWithAPIKey) {
         auto defaultApiClient = std::make_shared<org::openapitools::client::api::ApiClient>(defaultConfig);
         DefaultApi defaultApi(defaultApiClient);
 
+        GetCommentsOptions getOpts;
+        getOpts.urlId = utility::conversions::to_string_t(testUrlId);
+
         auto getResponse = defaultApi.getComments(
             utility::conversions::to_string_t(tenantID),
-            boost::none,  // page
-            boost::none,  // limit
-            boost::none,  // skip
-            boost::none,  // asTree
-            boost::none,  // skipChildren
-            boost::none,  // limitChildren
-            boost::none,  // maxTreeDepth
-            utility::conversions::to_string_t(testUrlId),  // urlId
-            boost::none,  // userId
-            boost::none,  // anonUserId
-            boost::none,  // contextUserId
-            boost::none,  // hashTag
-            boost::none,  // parentId
-            boost::none,  // direction
-            boost::none,  // fromDate
-            boost::none   // toDate
+            getOpts
         ).get();
 
         ASSERT_NE(getResponse, nullptr);
@@ -265,13 +250,15 @@ TEST_F(SSOIntegrationTest, PublicAPICreateAndFetch) {
     commentData->setCommenterName(utility::conversions::to_string_t(user.username));
     commentData->setDate(timestamp);
 
+    CreateCommentPublicOptions createOpts;
+    createOpts.sso = utility::conversions::to_string_t(token);
+
     auto createResponse = publicApi.createCommentPublic(
         utility::conversions::to_string_t(tenantID),
         utility::conversions::to_string_t(testUrlId),
         utility::conversions::to_string_t("test-" + std::to_string(timestamp)),
         commentData,
-        boost::none,
-        utility::conversions::to_string_t(token)
+        createOpts
     ).get();
 
     ASSERT_NE(createResponse, nullptr);
@@ -280,16 +267,13 @@ TEST_F(SSOIntegrationTest, PublicAPICreateAndFetch) {
     // Step 2: Fetch the comment back using PUBLIC API with SSO
     std::cout << "Step 2: Fetching comments for page '" << testUrlId << "' with SSO..." << std::endl;
 
+    GetCommentsPublicOptions getOpts;
+    getOpts.sso = utility::conversions::to_string_t(token);
+
     auto getResponse = publicApi.getCommentsPublic(
         utility::conversions::to_string_t(tenantID),
         utility::conversions::to_string_t(testUrlId),
-        boost::none,  // page
-        boost::none,  // limit
-        utility::conversions::to_string_t(token),  // ssoToken
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none, boost::none,
-        boost::none, boost::none, boost::none, boost::none, boost::none
+        getOpts
     ).get();
 
     ASSERT_NE(getResponse, nullptr);
diff --git a/update.sh b/update.sh
index d4d9f17..7f8f125 100755
--- a/update.sh
+++ b/update.sh
@@ -4,7 +4,7 @@
 # drops operations whose response types it can't model (the entire Moderation API and
 # several Public API methods), so cpp must use this build, which also has the nested
 # map fix. 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="./openapi-generator-cli.jar"
 
 [ -f "$JAR_FILE" ] || wget -q "$JAR_URL" -O "$JAR_FILE"