diff --git a/VERSION b/VERSION
index 4e6b52093..f17111878 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.36.1881
\ No newline at end of file
+1.36.1882
\ No newline at end of file
diff --git a/fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h b/fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h
index c25307695..79011ee51 100644
--- a/fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/CreateFlowRequest.h
@@ -34,8 +34,6 @@ public:
 	void setDescription(const std::string &description);
 	std::string getType() const;
 	void setType(const std::string &type);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getRoleArn() const;
 	void setRoleArn(const std::string &roleArn);
 	std::string getName() const;
@@ -50,7 +48,6 @@ public:
 private:
 	std::string description_;
 	std::string type_;
-	std::string requestId_;
 	std::string roleArn_;
 	std::string name_;
 	std::string definition_;
diff --git a/fnf/include/alibabacloud/fnf/model/CreateScheduleRequest.h b/fnf/include/alibabacloud/fnf/model/CreateScheduleRequest.h
index cb6fabd3d..2dc98d20d 100644
--- a/fnf/include/alibabacloud/fnf/model/CreateScheduleRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/CreateScheduleRequest.h
@@ -30,28 +30,28 @@ class ALIBABACLOUD_FNF_EXPORT CreateScheduleRequest : public RpcServiceRequest {
 public:
 	CreateScheduleRequest();
 	~CreateScheduleRequest();
-	std::string getScheduleName() const;
-	void setScheduleName(const std::string &scheduleName);
 	std::string getCronExpression() const;
 	void setCronExpression(const std::string &cronExpression);
-	std::string getPayload() const;
-	void setPayload(const std::string &payload);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
-	bool getEnable() const;
-	void setEnable(bool enable);
 	std::string getDescription() const;
 	void setDescription(const std::string &description);
+	std::string getScheduleName() const;
+	void setScheduleName(const std::string &scheduleName);
+	std::string getSignatureVersion() const;
+	void setSignatureVersion(const std::string &signatureVersion);
+	std::string getPayload() const;
+	void setPayload(const std::string &payload);
+	bool getEnable() const;
+	void setEnable(bool enable);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
 private:
-	std::string scheduleName_;
 	std::string cronExpression_;
-	std::string payload_;
-	std::string requestId_;
-	bool enable_;
 	std::string description_;
+	std::string scheduleName_;
+	std::string signatureVersion_;
+	std::string payload_;
+	bool enable_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/DeleteFlowRequest.h b/fnf/include/alibabacloud/fnf/model/DeleteFlowRequest.h
index 76c3b7fa4..76a6496c5 100644
--- a/fnf/include/alibabacloud/fnf/model/DeleteFlowRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/DeleteFlowRequest.h
@@ -30,13 +30,10 @@ class ALIBABACLOUD_FNF_EXPORT DeleteFlowRequest : public RpcServiceRequest {
 public:
 	DeleteFlowRequest();
 	~DeleteFlowRequest();
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getName() const;
 	void setName(const std::string &name);
 
 private:
-	std::string requestId_;
 	std::string name_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/DeleteScheduleRequest.h b/fnf/include/alibabacloud/fnf/model/DeleteScheduleRequest.h
index 13681f17e..0492f2582 100644
--- a/fnf/include/alibabacloud/fnf/model/DeleteScheduleRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/DeleteScheduleRequest.h
@@ -32,14 +32,11 @@ public:
 	~DeleteScheduleRequest();
 	std::string getScheduleName() const;
 	void setScheduleName(const std::string &scheduleName);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
 private:
 	std::string scheduleName_;
-	std::string requestId_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/DescribeExecutionRequest.h b/fnf/include/alibabacloud/fnf/model/DescribeExecutionRequest.h
index e2e915065..93ccd458f 100644
--- a/fnf/include/alibabacloud/fnf/model/DescribeExecutionRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/DescribeExecutionRequest.h
@@ -34,15 +34,12 @@ public:
 	void setExecutionName(const std::string &executionName);
 	int getWaitTimeSeconds() const;
 	void setWaitTimeSeconds(int waitTimeSeconds);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
 private:
 	std::string executionName_;
 	int waitTimeSeconds_;
-	std::string requestId_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/DescribeFlowRequest.h b/fnf/include/alibabacloud/fnf/model/DescribeFlowRequest.h
index 78f5de680..ee56fc7e5 100644
--- a/fnf/include/alibabacloud/fnf/model/DescribeFlowRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/DescribeFlowRequest.h
@@ -30,13 +30,10 @@ class ALIBABACLOUD_FNF_EXPORT DescribeFlowRequest : public RpcServiceRequest {
 public:
 	DescribeFlowRequest();
 	~DescribeFlowRequest();
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getName() const;
 	void setName(const std::string &name);
 
 private:
-	std::string requestId_;
 	std::string name_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/DescribeScheduleRequest.h b/fnf/include/alibabacloud/fnf/model/DescribeScheduleRequest.h
index fe1d0ede0..70ec69890 100644
--- a/fnf/include/alibabacloud/fnf/model/DescribeScheduleRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/DescribeScheduleRequest.h
@@ -32,14 +32,11 @@ public:
 	~DescribeScheduleRequest();
 	std::string getScheduleName() const;
 	void setScheduleName(const std::string &scheduleName);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
 private:
 	std::string scheduleName_;
-	std::string requestId_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/GetExecutionHistoryRequest.h b/fnf/include/alibabacloud/fnf/model/GetExecutionHistoryRequest.h
index 3f73ceb6c..4ca02bbdd 100644
--- a/fnf/include/alibabacloud/fnf/model/GetExecutionHistoryRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/GetExecutionHistoryRequest.h
@@ -34,8 +34,6 @@ public:
 	void setExecutionName(const std::string &executionName);
 	std::string getNextToken() const;
 	void setNextToken(const std::string &nextToken);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	int getLimit() const;
 	void setLimit(int limit);
 	std::string getFlowName() const;
@@ -44,7 +42,6 @@ public:
 private:
 	std::string executionName_;
 	std::string nextToken_;
-	std::string requestId_;
 	int limit_;
 	std::string flowName_;
 };
diff --git a/fnf/include/alibabacloud/fnf/model/ListExecutionsRequest.h b/fnf/include/alibabacloud/fnf/model/ListExecutionsRequest.h
index 9ed6f9769..13a80d49f 100644
--- a/fnf/include/alibabacloud/fnf/model/ListExecutionsRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/ListExecutionsRequest.h
@@ -36,8 +36,6 @@ public:
 	void setExecutionNamePrefix(const std::string &executionNamePrefix);
 	std::string getNextToken() const;
 	void setNextToken(const std::string &nextToken);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	int getLimit() const;
 	void setLimit(int limit);
 	std::string getFlowName() const;
@@ -51,7 +49,6 @@ private:
 	std::string startedTimeBegin_;
 	std::string executionNamePrefix_;
 	std::string nextToken_;
-	std::string requestId_;
 	int limit_;
 	std::string flowName_;
 	std::string startedTimeEnd_;
diff --git a/fnf/include/alibabacloud/fnf/model/ListFlowsRequest.h b/fnf/include/alibabacloud/fnf/model/ListFlowsRequest.h
index 40b8bc6be..06b75f625 100644
--- a/fnf/include/alibabacloud/fnf/model/ListFlowsRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/ListFlowsRequest.h
@@ -32,14 +32,11 @@ public:
 	~ListFlowsRequest();
 	std::string getNextToken() const;
 	void setNextToken(const std::string &nextToken);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	int getLimit() const;
 	void setLimit(int limit);
 
 private:
 	std::string nextToken_;
-	std::string requestId_;
 	int limit_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/ListSchedulesRequest.h b/fnf/include/alibabacloud/fnf/model/ListSchedulesRequest.h
index 9d3fd6a08..7e0e28536 100644
--- a/fnf/include/alibabacloud/fnf/model/ListSchedulesRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/ListSchedulesRequest.h
@@ -32,8 +32,6 @@ public:
 	~ListSchedulesRequest();
 	std::string getNextToken() const;
 	void setNextToken(const std::string &nextToken);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	int getLimit() const;
 	void setLimit(int limit);
 	std::string getFlowName() const;
@@ -41,7 +39,6 @@ public:
 
 private:
 	std::string nextToken_;
-	std::string requestId_;
 	int limit_;
 	std::string flowName_;
 };
diff --git a/fnf/include/alibabacloud/fnf/model/ReportTaskFailedRequest.h b/fnf/include/alibabacloud/fnf/model/ReportTaskFailedRequest.h
index 27acb6f78..255c14e54 100644
--- a/fnf/include/alibabacloud/fnf/model/ReportTaskFailedRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/ReportTaskFailedRequest.h
@@ -34,15 +34,12 @@ public:
 	void setCause(const std::string &cause);
 	std::string getError() const;
 	void setError(const std::string &error);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getTaskToken() const;
 	void setTaskToken(const std::string &taskToken);
 
 private:
 	std::string cause_;
 	std::string error_;
-	std::string requestId_;
 	std::string taskToken_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/ReportTaskSucceededRequest.h b/fnf/include/alibabacloud/fnf/model/ReportTaskSucceededRequest.h
index b96ab6bf2..3245348e8 100644
--- a/fnf/include/alibabacloud/fnf/model/ReportTaskSucceededRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/ReportTaskSucceededRequest.h
@@ -32,14 +32,11 @@ public:
 	~ReportTaskSucceededRequest();
 	std::string getOutput() const;
 	void setOutput(const std::string &output);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getTaskToken() const;
 	void setTaskToken(const std::string &taskToken);
 
 private:
 	std::string output_;
-	std::string requestId_;
 	std::string taskToken_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/StartExecutionRequest.h b/fnf/include/alibabacloud/fnf/model/StartExecutionRequest.h
index 552dc8b00..06d8ab47b 100644
--- a/fnf/include/alibabacloud/fnf/model/StartExecutionRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/StartExecutionRequest.h
@@ -36,8 +36,6 @@ public:
 	void setExecutionName(const std::string &executionName);
 	std::string getInput() const;
 	void setInput(const std::string &input);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
@@ -45,7 +43,6 @@ private:
 	std::string callbackFnFTaskToken_;
 	std::string executionName_;
 	std::string input_;
-	std::string requestId_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/StartSyncExecutionRequest.h b/fnf/include/alibabacloud/fnf/model/StartSyncExecutionRequest.h
index f07513513..ce0a5663f 100644
--- a/fnf/include/alibabacloud/fnf/model/StartSyncExecutionRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/StartSyncExecutionRequest.h
@@ -34,15 +34,12 @@ public:
 	void setExecutionName(const std::string &executionName);
 	std::string getInput() const;
 	void setInput(const std::string &input);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
 private:
 	std::string executionName_;
 	std::string input_;
-	std::string requestId_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/StopExecutionRequest.h b/fnf/include/alibabacloud/fnf/model/StopExecutionRequest.h
index 5a153a4a3..f48bc1630 100644
--- a/fnf/include/alibabacloud/fnf/model/StopExecutionRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/StopExecutionRequest.h
@@ -36,8 +36,6 @@ public:
 	void setCause(const std::string &cause);
 	std::string getError() const;
 	void setError(const std::string &error);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
@@ -45,7 +43,6 @@ private:
 	std::string executionName_;
 	std::string cause_;
 	std::string error_;
-	std::string requestId_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h b/fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h
index 9840101e4..f1b1e1af4 100644
--- a/fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/UpdateFlowRequest.h
@@ -34,8 +34,6 @@ public:
 	void setDescription(const std::string &description);
 	std::string getType() const;
 	void setType(const std::string &type);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
 	std::string getRoleArn() const;
 	void setRoleArn(const std::string &roleArn);
 	std::string getName() const;
@@ -48,7 +46,6 @@ public:
 private:
 	std::string description_;
 	std::string type_;
-	std::string requestId_;
 	std::string roleArn_;
 	std::string name_;
 	std::string definition_;
diff --git a/fnf/include/alibabacloud/fnf/model/UpdateScheduleRequest.h b/fnf/include/alibabacloud/fnf/model/UpdateScheduleRequest.h
index 0a315373f..69d3de979 100644
--- a/fnf/include/alibabacloud/fnf/model/UpdateScheduleRequest.h
+++ b/fnf/include/alibabacloud/fnf/model/UpdateScheduleRequest.h
@@ -30,28 +30,25 @@ class ALIBABACLOUD_FNF_EXPORT UpdateScheduleRequest : public RpcServiceRequest {
 public:
 	UpdateScheduleRequest();
 	~UpdateScheduleRequest();
-	std::string getScheduleName() const;
-	void setScheduleName(const std::string &scheduleName);
 	std::string getCronExpression() const;
 	void setCronExpression(const std::string &cronExpression);
-	std::string getPayload() const;
-	void setPayload(const std::string &payload);
-	std::string getRequestId() const;
-	void setRequestId(const std::string &requestId);
-	bool getEnable() const;
-	void setEnable(bool enable);
 	std::string getDescription() const;
 	void setDescription(const std::string &description);
+	std::string getScheduleName() const;
+	void setScheduleName(const std::string &scheduleName);
+	std::string getPayload() const;
+	void setPayload(const std::string &payload);
+	bool getEnable() const;
+	void setEnable(bool enable);
 	std::string getFlowName() const;
 	void setFlowName(const std::string &flowName);
 
 private:
-	std::string scheduleName_;
 	std::string cronExpression_;
-	std::string payload_;
-	std::string requestId_;
-	bool enable_;
 	std::string description_;
+	std::string scheduleName_;
+	std::string payload_;
+	bool enable_;
 	std::string flowName_;
 };
 } // namespace Model
diff --git a/fnf/src/model/CreateFlowRequest.cc b/fnf/src/model/CreateFlowRequest.cc
index c1bfa419a..0bf78065f 100644
--- a/fnf/src/model/CreateFlowRequest.cc
+++ b/fnf/src/model/CreateFlowRequest.cc
@@ -43,15 +43,6 @@ void CreateFlowRequest::setType(const std::string &type) {
   setBodyParameter(std::string("Type"), type);
 }
 
-std::string CreateFlowRequest::getRequestId() const {
-  return requestId_;
-}
-
-void CreateFlowRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string CreateFlowRequest::getRoleArn() const {
   return roleArn_;
 }
diff --git a/fnf/src/model/CreateScheduleRequest.cc b/fnf/src/model/CreateScheduleRequest.cc
index 17ad8adfb..383db9f8f 100644
--- a/fnf/src/model/CreateScheduleRequest.cc
+++ b/fnf/src/model/CreateScheduleRequest.cc
@@ -25,15 +25,6 @@ CreateScheduleRequest::CreateScheduleRequest()
 
 CreateScheduleRequest::~CreateScheduleRequest() {}
 
-std::string CreateScheduleRequest::getScheduleName() const {
-  return scheduleName_;
-}
-
-void CreateScheduleRequest::setScheduleName(const std::string &scheduleName) {
-  scheduleName_ = scheduleName;
-  setBodyParameter(std::string("ScheduleName"), scheduleName);
-}
-
 std::string CreateScheduleRequest::getCronExpression() const {
   return cronExpression_;
 }
@@ -43,33 +34,6 @@ void CreateScheduleRequest::setCronExpression(const std::string &cronExpression)
   setBodyParameter(std::string("CronExpression"), cronExpression);
 }
 
-std::string CreateScheduleRequest::getPayload() const {
-  return payload_;
-}
-
-void CreateScheduleRequest::setPayload(const std::string &payload) {
-  payload_ = payload;
-  setBodyParameter(std::string("Payload"), payload);
-}
-
-std::string CreateScheduleRequest::getRequestId() const {
-  return requestId_;
-}
-
-void CreateScheduleRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
-bool CreateScheduleRequest::getEnable() const {
-  return enable_;
-}
-
-void CreateScheduleRequest::setEnable(bool enable) {
-  enable_ = enable;
-  setBodyParameter(std::string("Enable"), enable ? "true" : "false");
-}
-
 std::string CreateScheduleRequest::getDescription() const {
   return description_;
 }
@@ -79,6 +43,42 @@ void CreateScheduleRequest::setDescription(const std::string &description) {
   setBodyParameter(std::string("Description"), description);
 }
 
+std::string CreateScheduleRequest::getScheduleName() const {
+  return scheduleName_;
+}
+
+void CreateScheduleRequest::setScheduleName(const std::string &scheduleName) {
+  scheduleName_ = scheduleName;
+  setBodyParameter(std::string("ScheduleName"), scheduleName);
+}
+
+std::string CreateScheduleRequest::getSignatureVersion() const {
+  return signatureVersion_;
+}
+
+void CreateScheduleRequest::setSignatureVersion(const std::string &signatureVersion) {
+  signatureVersion_ = signatureVersion;
+  setParameter(std::string("SignatureVersion"), signatureVersion);
+}
+
+std::string CreateScheduleRequest::getPayload() const {
+  return payload_;
+}
+
+void CreateScheduleRequest::setPayload(const std::string &payload) {
+  payload_ = payload;
+  setBodyParameter(std::string("Payload"), payload);
+}
+
+bool CreateScheduleRequest::getEnable() const {
+  return enable_;
+}
+
+void CreateScheduleRequest::setEnable(bool enable) {
+  enable_ = enable;
+  setBodyParameter(std::string("Enable"), enable ? "true" : "false");
+}
+
 std::string CreateScheduleRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/DeleteFlowRequest.cc b/fnf/src/model/DeleteFlowRequest.cc
index 73c0386e1..8f92eae3f 100644
--- a/fnf/src/model/DeleteFlowRequest.cc
+++ b/fnf/src/model/DeleteFlowRequest.cc
@@ -20,20 +20,11 @@ using AlibabaCloud::Fnf::Model::DeleteFlowRequest;
 
 DeleteFlowRequest::DeleteFlowRequest()
     : RpcServiceRequest("fnf", "2019-03-15", "DeleteFlow") {
-  setMethod(HttpRequest::Method::Get);
+  setMethod(HttpRequest::Method::Post);
 }
 
 DeleteFlowRequest::~DeleteFlowRequest() {}
 
-std::string DeleteFlowRequest::getRequestId() const {
-  return requestId_;
-}
-
-void DeleteFlowRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string DeleteFlowRequest::getName() const {
   return name_;
 }
diff --git a/fnf/src/model/DeleteScheduleRequest.cc b/fnf/src/model/DeleteScheduleRequest.cc
index 8550f4ec9..544d8e2ef 100644
--- a/fnf/src/model/DeleteScheduleRequest.cc
+++ b/fnf/src/model/DeleteScheduleRequest.cc
@@ -20,7 +20,7 @@ using AlibabaCloud::Fnf::Model::DeleteScheduleRequest;
 
 DeleteScheduleRequest::DeleteScheduleRequest()
     : RpcServiceRequest("fnf", "2019-03-15", "DeleteSchedule") {
-  setMethod(HttpRequest::Method::Get);
+  setMethod(HttpRequest::Method::Post);
 }
 
 DeleteScheduleRequest::~DeleteScheduleRequest() {}
@@ -34,15 +34,6 @@ void DeleteScheduleRequest::setScheduleName(const std::string &scheduleName) {
   setParameter(std::string("ScheduleName"), scheduleName);
 }
 
-std::string DeleteScheduleRequest::getRequestId() const {
-  return requestId_;
-}
-
-void DeleteScheduleRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string DeleteScheduleRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/DescribeExecutionRequest.cc b/fnf/src/model/DescribeExecutionRequest.cc
index 875495003..3c9c811c9 100644
--- a/fnf/src/model/DescribeExecutionRequest.cc
+++ b/fnf/src/model/DescribeExecutionRequest.cc
@@ -43,15 +43,6 @@ void DescribeExecutionRequest::setWaitTimeSeconds(int waitTimeSeconds) {
   setParameter(std::string("WaitTimeSeconds"), std::to_string(waitTimeSeconds));
 }
 
-std::string DescribeExecutionRequest::getRequestId() const {
-  return requestId_;
-}
-
-void DescribeExecutionRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string DescribeExecutionRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/DescribeFlowRequest.cc b/fnf/src/model/DescribeFlowRequest.cc
index 76b0212c8..0ab629fba 100644
--- a/fnf/src/model/DescribeFlowRequest.cc
+++ b/fnf/src/model/DescribeFlowRequest.cc
@@ -25,15 +25,6 @@ DescribeFlowRequest::DescribeFlowRequest()
 
 DescribeFlowRequest::~DescribeFlowRequest() {}
 
-std::string DescribeFlowRequest::getRequestId() const {
-  return requestId_;
-}
-
-void DescribeFlowRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string DescribeFlowRequest::getName() const {
   return name_;
 }
diff --git a/fnf/src/model/DescribeScheduleRequest.cc b/fnf/src/model/DescribeScheduleRequest.cc
index 7e83e22a3..a4366842d 100644
--- a/fnf/src/model/DescribeScheduleRequest.cc
+++ b/fnf/src/model/DescribeScheduleRequest.cc
@@ -34,15 +34,6 @@ void DescribeScheduleRequest::setScheduleName(const std::string &scheduleName) {
   setParameter(std::string("ScheduleName"), scheduleName);
 }
 
-std::string DescribeScheduleRequest::getRequestId() const {
-  return requestId_;
-}
-
-void DescribeScheduleRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string DescribeScheduleRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/GetExecutionHistoryRequest.cc b/fnf/src/model/GetExecutionHistoryRequest.cc
index 8950ff1f4..7a3823aa8 100644
--- a/fnf/src/model/GetExecutionHistoryRequest.cc
+++ b/fnf/src/model/GetExecutionHistoryRequest.cc
@@ -43,15 +43,6 @@ void GetExecutionHistoryRequest::setNextToken(const std::string &nextToken) {
   setParameter(std::string("NextToken"), nextToken);
 }
 
-std::string GetExecutionHistoryRequest::getRequestId() const {
-  return requestId_;
-}
-
-void GetExecutionHistoryRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 int GetExecutionHistoryRequest::getLimit() const {
   return limit_;
 }
diff --git a/fnf/src/model/ListExecutionsRequest.cc b/fnf/src/model/ListExecutionsRequest.cc
index 3a99e788d..f59043cfa 100644
--- a/fnf/src/model/ListExecutionsRequest.cc
+++ b/fnf/src/model/ListExecutionsRequest.cc
@@ -52,15 +52,6 @@ void ListExecutionsRequest::setNextToken(const std::string &nextToken) {
   setParameter(std::string("NextToken"), nextToken);
 }
 
-std::string ListExecutionsRequest::getRequestId() const {
-  return requestId_;
-}
-
-void ListExecutionsRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 int ListExecutionsRequest::getLimit() const {
   return limit_;
 }
diff --git a/fnf/src/model/ListFlowsRequest.cc b/fnf/src/model/ListFlowsRequest.cc
index d2110ad6c..79635f176 100644
--- a/fnf/src/model/ListFlowsRequest.cc
+++ b/fnf/src/model/ListFlowsRequest.cc
@@ -34,15 +34,6 @@ void ListFlowsRequest::setNextToken(const std::string &nextToken) {
   setParameter(std::string("NextToken"), nextToken);
 }
 
-std::string ListFlowsRequest::getRequestId() const {
-  return requestId_;
-}
-
-void ListFlowsRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 int ListFlowsRequest::getLimit() const {
   return limit_;
 }
diff --git a/fnf/src/model/ListSchedulesRequest.cc b/fnf/src/model/ListSchedulesRequest.cc
index defe7f16e..e1ef15f83 100644
--- a/fnf/src/model/ListSchedulesRequest.cc
+++ b/fnf/src/model/ListSchedulesRequest.cc
@@ -34,15 +34,6 @@ void ListSchedulesRequest::setNextToken(const std::string &nextToken) {
   setParameter(std::string("NextToken"), nextToken);
 }
 
-std::string ListSchedulesRequest::getRequestId() const {
-  return requestId_;
-}
-
-void ListSchedulesRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 int ListSchedulesRequest::getLimit() const {
   return limit_;
 }
diff --git a/fnf/src/model/ReportTaskFailedRequest.cc b/fnf/src/model/ReportTaskFailedRequest.cc
index 206cf7058..dfa79ce77 100644
--- a/fnf/src/model/ReportTaskFailedRequest.cc
+++ b/fnf/src/model/ReportTaskFailedRequest.cc
@@ -43,15 +43,6 @@ void ReportTaskFailedRequest::setError(const std::string &error) {
   setBodyParameter(std::string("Error"), error);
 }
 
-std::string ReportTaskFailedRequest::getRequestId() const {
-  return requestId_;
-}
-
-void ReportTaskFailedRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string ReportTaskFailedRequest::getTaskToken() const {
   return taskToken_;
 }
diff --git a/fnf/src/model/ReportTaskSucceededRequest.cc b/fnf/src/model/ReportTaskSucceededRequest.cc
index 81d2ec062..ec0c64595 100644
--- a/fnf/src/model/ReportTaskSucceededRequest.cc
+++ b/fnf/src/model/ReportTaskSucceededRequest.cc
@@ -34,15 +34,6 @@ void ReportTaskSucceededRequest::setOutput(const std::string &output) {
   setBodyParameter(std::string("Output"), output);
 }
 
-std::string ReportTaskSucceededRequest::getRequestId() const {
-  return requestId_;
-}
-
-void ReportTaskSucceededRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string ReportTaskSucceededRequest::getTaskToken() const {
   return taskToken_;
 }
diff --git a/fnf/src/model/StartExecutionRequest.cc b/fnf/src/model/StartExecutionRequest.cc
index 84a1d1fbe..691032eda 100644
--- a/fnf/src/model/StartExecutionRequest.cc
+++ b/fnf/src/model/StartExecutionRequest.cc
@@ -52,15 +52,6 @@ void StartExecutionRequest::setInput(const std::string &input) {
   setBodyParameter(std::string("Input"), input);
 }
 
-std::string StartExecutionRequest::getRequestId() const {
-  return requestId_;
-}
-
-void StartExecutionRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string StartExecutionRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/StartSyncExecutionRequest.cc b/fnf/src/model/StartSyncExecutionRequest.cc
index 3e109a1da..8f1a878af 100644
--- a/fnf/src/model/StartSyncExecutionRequest.cc
+++ b/fnf/src/model/StartSyncExecutionRequest.cc
@@ -43,15 +43,6 @@ void StartSyncExecutionRequest::setInput(const std::string &input) {
   setBodyParameter(std::string("Input"), input);
 }
 
-std::string StartSyncExecutionRequest::getRequestId() const {
-  return requestId_;
-}
-
-void StartSyncExecutionRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string StartSyncExecutionRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/StopExecutionRequest.cc b/fnf/src/model/StopExecutionRequest.cc
index 785bb0645..b09edb8e8 100644
--- a/fnf/src/model/StopExecutionRequest.cc
+++ b/fnf/src/model/StopExecutionRequest.cc
@@ -52,15 +52,6 @@ void StopExecutionRequest::setError(const std::string &error) {
   setBodyParameter(std::string("Error"), error);
 }
 
-std::string StopExecutionRequest::getRequestId() const {
-  return requestId_;
-}
-
-void StopExecutionRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string StopExecutionRequest::getFlowName() const {
   return flowName_;
 }
diff --git a/fnf/src/model/UpdateFlowRequest.cc b/fnf/src/model/UpdateFlowRequest.cc
index 95d991f9f..7f7b01871 100644
--- a/fnf/src/model/UpdateFlowRequest.cc
+++ b/fnf/src/model/UpdateFlowRequest.cc
@@ -43,15 +43,6 @@ void UpdateFlowRequest::setType(const std::string &type) {
   setBodyParameter(std::string("Type"), type);
 }
 
-std::string UpdateFlowRequest::getRequestId() const {
-  return requestId_;
-}
-
-void UpdateFlowRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
 std::string UpdateFlowRequest::getRoleArn() const {
   return roleArn_;
 }
diff --git a/fnf/src/model/UpdateScheduleRequest.cc b/fnf/src/model/UpdateScheduleRequest.cc
index c7c9b5a9f..59d6556ed 100644
--- a/fnf/src/model/UpdateScheduleRequest.cc
+++ b/fnf/src/model/UpdateScheduleRequest.cc
@@ -25,15 +25,6 @@ UpdateScheduleRequest::UpdateScheduleRequest()
 
 UpdateScheduleRequest::~UpdateScheduleRequest() {}
 
-std::string UpdateScheduleRequest::getScheduleName() const {
-  return scheduleName_;
-}
-
-void UpdateScheduleRequest::setScheduleName(const std::string &scheduleName) {
-  scheduleName_ = scheduleName;
-  setBodyParameter(std::string("ScheduleName"), scheduleName);
-}
-
 std::string UpdateScheduleRequest::getCronExpression() const {
   return cronExpression_;
 }
@@ -43,33 +34,6 @@ void UpdateScheduleRequest::setCronExpression(const std::string &cronExpression)
   setBodyParameter(std::string("CronExpression"), cronExpression);
 }
 
-std::string UpdateScheduleRequest::getPayload() const {
-  return payload_;
-}
-
-void UpdateScheduleRequest::setPayload(const std::string &payload) {
-  payload_ = payload;
-  setBodyParameter(std::string("Payload"), payload);
-}
-
-std::string UpdateScheduleRequest::getRequestId() const {
-  return requestId_;
-}
-
-void UpdateScheduleRequest::setRequestId(const std::string &requestId) {
-  requestId_ = requestId;
-  setParameter(std::string("RequestId"), requestId);
-}
-
-bool UpdateScheduleRequest::getEnable() const {
-  return enable_;
-}
-
-void UpdateScheduleRequest::setEnable(bool enable) {
-  enable_ = enable;
-  setBodyParameter(std::string("Enable"), enable ? "true" : "false");
-}
-
 std::string UpdateScheduleRequest::getDescription() const {
   return description_;
 }
@@ -79,6 +43,33 @@ void UpdateScheduleRequest::setDescription(const std::string &description) {
   setBodyParameter(std::string("Description"), description);
 }
 
+std::string UpdateScheduleRequest::getScheduleName() const {
+  return scheduleName_;
+}
+
+void UpdateScheduleRequest::setScheduleName(const std::string &scheduleName) {
+  scheduleName_ = scheduleName;
+  setBodyParameter(std::string("ScheduleName"), scheduleName);
+}
+
+std::string UpdateScheduleRequest::getPayload() const {
+  return payload_;
+}
+
+void UpdateScheduleRequest::setPayload(const std::string &payload) {
+  payload_ = payload;
+  setBodyParameter(std::string("Payload"), payload);
+}
+
+bool UpdateScheduleRequest::getEnable() const {
+  return enable_;
+}
+
+void UpdateScheduleRequest::setEnable(bool enable) {
+  enable_ = enable;
+  setBodyParameter(std::string("Enable"), enable ? "true" : "false");
+}
+
 std::string UpdateScheduleRequest::getFlowName() const {
   return flowName_;
 }