Rebuild sdk (#60)

* rebuild sdk

* fixed ut include Utils.h

ram/src/RamClient.cc

@@ -123,42 +123,6 @@ RamClient::ListUsersOutcomeCallable RamClient::listUsersCallable(const ListUsers
 	return task->get_future();
 }
 
-RamClient::GetUserMFAInfoOutcome RamClient::getUserMFAInfo(const GetUserMFAInfoRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return GetUserMFAInfoOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return GetUserMFAInfoOutcome(GetUserMFAInfoResult(outcome.result()));
-	else
-		return GetUserMFAInfoOutcome(outcome.error());
-}
-
-void RamClient::getUserMFAInfoAsync(const GetUserMFAInfoRequest& request, const GetUserMFAInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, getUserMFAInfo(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::GetUserMFAInfoOutcomeCallable RamClient::getUserMFAInfoCallable(const GetUserMFAInfoRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<GetUserMFAInfoOutcome()>>(
-			[this, request]()
-			{
-			return this->getUserMFAInfo(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::UnbindMFADeviceOutcome RamClient::unbindMFADevice(const UnbindMFADeviceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -195,6 +159,42 @@ RamClient::UnbindMFADeviceOutcomeCallable RamClient::unbindMFADeviceCallable(con
 	return task->get_future();
 }
 
+RamClient::GetUserMFAInfoOutcome RamClient::getUserMFAInfo(const GetUserMFAInfoRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return GetUserMFAInfoOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return GetUserMFAInfoOutcome(GetUserMFAInfoResult(outcome.result()));
+	else
+		return GetUserMFAInfoOutcome(outcome.error());
+}
+
+void RamClient::getUserMFAInfoAsync(const GetUserMFAInfoRequest& request, const GetUserMFAInfoAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, getUserMFAInfo(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::GetUserMFAInfoOutcomeCallable RamClient::getUserMFAInfoCallable(const GetUserMFAInfoRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<GetUserMFAInfoOutcome()>>(
+			[this, request]()
+			{
+			return this->getUserMFAInfo(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::BindMFADeviceOutcome RamClient::bindMFADevice(const BindMFADeviceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -267,78 +267,6 @@ RamClient::ListPublicKeysOutcomeCallable RamClient::listPublicKeysCallable(const
 	return task->get_future();
 }
 
-RamClient::AttachPolicyToRoleOutcome RamClient::attachPolicyToRole(const AttachPolicyToRoleRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return AttachPolicyToRoleOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return AttachPolicyToRoleOutcome(AttachPolicyToRoleResult(outcome.result()));
-	else
-		return AttachPolicyToRoleOutcome(outcome.error());
-}
-
-void RamClient::attachPolicyToRoleAsync(const AttachPolicyToRoleRequest& request, const AttachPolicyToRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, attachPolicyToRole(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::AttachPolicyToRoleOutcomeCallable RamClient::attachPolicyToRoleCallable(const AttachPolicyToRoleRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<AttachPolicyToRoleOutcome()>>(
-			[this, request]()
-			{
-			return this->attachPolicyToRole(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-RamClient::AddUserToGroupOutcome RamClient::addUserToGroup(const AddUserToGroupRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return AddUserToGroupOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return AddUserToGroupOutcome(AddUserToGroupResult(outcome.result()));
-	else
-		return AddUserToGroupOutcome(outcome.error());
-}
-
-void RamClient::addUserToGroupAsync(const AddUserToGroupRequest& request, const AddUserToGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, addUserToGroup(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::AddUserToGroupOutcomeCallable RamClient::addUserToGroupCallable(const AddUserToGroupRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<AddUserToGroupOutcome()>>(
-			[this, request]()
-			{
-			return this->addUserToGroup(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::GetAccountAliasOutcome RamClient::getAccountAlias(const GetAccountAliasRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -411,6 +339,78 @@ RamClient::GetLoginProfileOutcomeCallable RamClient::getLoginProfileCallable(con
 	return task->get_future();
 }
 
+RamClient::AttachPolicyToRoleOutcome RamClient::attachPolicyToRole(const AttachPolicyToRoleRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return AttachPolicyToRoleOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return AttachPolicyToRoleOutcome(AttachPolicyToRoleResult(outcome.result()));
+	else
+		return AttachPolicyToRoleOutcome(outcome.error());
+}
+
+void RamClient::attachPolicyToRoleAsync(const AttachPolicyToRoleRequest& request, const AttachPolicyToRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, attachPolicyToRole(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::AttachPolicyToRoleOutcomeCallable RamClient::attachPolicyToRoleCallable(const AttachPolicyToRoleRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<AttachPolicyToRoleOutcome()>>(
+			[this, request]()
+			{
+			return this->attachPolicyToRole(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+RamClient::AddUserToGroupOutcome RamClient::addUserToGroup(const AddUserToGroupRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return AddUserToGroupOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return AddUserToGroupOutcome(AddUserToGroupResult(outcome.result()));
+	else
+		return AddUserToGroupOutcome(outcome.error());
+}
+
+void RamClient::addUserToGroupAsync(const AddUserToGroupRequest& request, const AddUserToGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, addUserToGroup(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::AddUserToGroupOutcomeCallable RamClient::addUserToGroupCallable(const AddUserToGroupRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<AddUserToGroupOutcome()>>(
+			[this, request]()
+			{
+			return this->addUserToGroup(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::ListEntitiesForPolicyOutcome RamClient::listEntitiesForPolicy(const ListEntitiesForPolicyRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -447,42 +447,6 @@ RamClient::ListEntitiesForPolicyOutcomeCallable RamClient::listEntitiesForPolicy
 	return task->get_future();
 }
 
-RamClient::SetSecurityPreferenceOutcome RamClient::setSecurityPreference(const SetSecurityPreferenceRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return SetSecurityPreferenceOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return SetSecurityPreferenceOutcome(SetSecurityPreferenceResult(outcome.result()));
-	else
-		return SetSecurityPreferenceOutcome(outcome.error());
-}
-
-void RamClient::setSecurityPreferenceAsync(const SetSecurityPreferenceRequest& request, const SetSecurityPreferenceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, setSecurityPreference(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::SetSecurityPreferenceOutcomeCallable RamClient::setSecurityPreferenceCallable(const SetSecurityPreferenceRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<SetSecurityPreferenceOutcome()>>(
-			[this, request]()
-			{
-			return this->setSecurityPreference(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::ListPoliciesForUserOutcome RamClient::listPoliciesForUser(const ListPoliciesForUserRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -519,6 +483,42 @@ RamClient::ListPoliciesForUserOutcomeCallable RamClient::listPoliciesForUserCall
 	return task->get_future();
 }
 
+RamClient::SetSecurityPreferenceOutcome RamClient::setSecurityPreference(const SetSecurityPreferenceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SetSecurityPreferenceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SetSecurityPreferenceOutcome(SetSecurityPreferenceResult(outcome.result()));
+	else
+		return SetSecurityPreferenceOutcome(outcome.error());
+}
+
+void RamClient::setSecurityPreferenceAsync(const SetSecurityPreferenceRequest& request, const SetSecurityPreferenceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, setSecurityPreference(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::SetSecurityPreferenceOutcomeCallable RamClient::setSecurityPreferenceCallable(const SetSecurityPreferenceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SetSecurityPreferenceOutcome()>>(
+			[this, request]()
+			{
+			return this->setSecurityPreference(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::UpdateLoginProfileOutcome RamClient::updateLoginProfile(const UpdateLoginProfileRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -627,42 +627,6 @@ RamClient::GetPolicyVersionOutcomeCallable RamClient::getPolicyVersionCallable(c
 	return task->get_future();
 }
 
-RamClient::DeleteRoleOutcome RamClient::deleteRole(const DeleteRoleRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DeleteRoleOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DeleteRoleOutcome(DeleteRoleResult(outcome.result()));
-	else
-		return DeleteRoleOutcome(outcome.error());
-}
-
-void RamClient::deleteRoleAsync(const DeleteRoleRequest& request, const DeleteRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, deleteRole(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::DeleteRoleOutcomeCallable RamClient::deleteRoleCallable(const DeleteRoleRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DeleteRoleOutcome()>>(
-			[this, request]()
-			{
-			return this->deleteRole(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::GetUserOutcome RamClient::getUser(const GetUserRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -699,6 +663,42 @@ RamClient::GetUserOutcomeCallable RamClient::getUserCallable(const GetUserReques
 	return task->get_future();
 }
 
+RamClient::DeleteRoleOutcome RamClient::deleteRole(const DeleteRoleRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DeleteRoleOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DeleteRoleOutcome(DeleteRoleResult(outcome.result()));
+	else
+		return DeleteRoleOutcome(outcome.error());
+}
+
+void RamClient::deleteRoleAsync(const DeleteRoleRequest& request, const DeleteRoleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, deleteRole(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::DeleteRoleOutcomeCallable RamClient::deleteRoleCallable(const DeleteRoleRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DeleteRoleOutcome()>>(
+			[this, request]()
+			{
+			return this->deleteRole(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::DeleteVirtualMFADeviceOutcome RamClient::deleteVirtualMFADevice(const DeleteVirtualMFADeviceRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -735,42 +735,6 @@ RamClient::DeleteVirtualMFADeviceOutcomeCallable RamClient::deleteVirtualMFADevi
 	return task->get_future();
 }
 
-RamClient::UploadPublicKeyOutcome RamClient::uploadPublicKey(const UploadPublicKeyRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return UploadPublicKeyOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return UploadPublicKeyOutcome(UploadPublicKeyResult(outcome.result()));
-	else
-		return UploadPublicKeyOutcome(outcome.error());
-}
-
-void RamClient::uploadPublicKeyAsync(const UploadPublicKeyRequest& request, const UploadPublicKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, uploadPublicKey(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::UploadPublicKeyOutcomeCallable RamClient::uploadPublicKeyCallable(const UploadPublicKeyRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<UploadPublicKeyOutcome()>>(
-			[this, request]()
-			{
-			return this->uploadPublicKey(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::DeletePolicyVersionOutcome RamClient::deletePolicyVersion(const DeletePolicyVersionRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -807,6 +771,42 @@ RamClient::DeletePolicyVersionOutcomeCallable RamClient::deletePolicyVersionCall
 	return task->get_future();
 }
 
+RamClient::UploadPublicKeyOutcome RamClient::uploadPublicKey(const UploadPublicKeyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return UploadPublicKeyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return UploadPublicKeyOutcome(UploadPublicKeyResult(outcome.result()));
+	else
+		return UploadPublicKeyOutcome(outcome.error());
+}
+
+void RamClient::uploadPublicKeyAsync(const UploadPublicKeyRequest& request, const UploadPublicKeyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, uploadPublicKey(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::UploadPublicKeyOutcomeCallable RamClient::uploadPublicKeyCallable(const UploadPublicKeyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<UploadPublicKeyOutcome()>>(
+			[this, request]()
+			{
+			return this->uploadPublicKey(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::RemoveUserFromGroupOutcome RamClient::removeUserFromGroup(const RemoveUserFromGroupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1203,42 +1203,6 @@ RamClient::CreateVirtualMFADeviceOutcomeCallable RamClient::createVirtualMFADevi
 	return task->get_future();
 }
 
-RamClient::ListGroupsOutcome RamClient::listGroups(const ListGroupsRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ListGroupsOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ListGroupsOutcome(ListGroupsResult(outcome.result()));
-	else
-		return ListGroupsOutcome(outcome.error());
-}
-
-void RamClient::listGroupsAsync(const ListGroupsRequest& request, const ListGroupsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, listGroups(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::ListGroupsOutcomeCallable RamClient::listGroupsCallable(const ListGroupsRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ListGroupsOutcome()>>(
-			[this, request]()
-			{
-			return this->listGroups(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::DeleteUserOutcome RamClient::deleteUser(const DeleteUserRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1275,6 +1239,42 @@ RamClient::DeleteUserOutcomeCallable RamClient::deleteUserCallable(const DeleteU
 	return task->get_future();
 }
 
+RamClient::ListGroupsOutcome RamClient::listGroups(const ListGroupsRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListGroupsOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListGroupsOutcome(ListGroupsResult(outcome.result()));
+	else
+		return ListGroupsOutcome(outcome.error());
+}
+
+void RamClient::listGroupsAsync(const ListGroupsRequest& request, const ListGroupsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listGroups(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::ListGroupsOutcomeCallable RamClient::listGroupsCallable(const ListGroupsRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListGroupsOutcome()>>(
+			[this, request]()
+			{
+			return this->listGroups(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::DeletePolicyOutcome RamClient::deletePolicy(const DeletePolicyRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1887,6 +1887,42 @@ RamClient::CreateGroupOutcomeCallable RamClient::createGroupCallable(const Creat
 	return task->get_future();
 }
 
+RamClient::ListAccessKeysOutcome RamClient::listAccessKeys(const ListAccessKeysRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ListAccessKeysOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ListAccessKeysOutcome(ListAccessKeysResult(outcome.result()));
+	else
+		return ListAccessKeysOutcome(outcome.error());
+}
+
+void RamClient::listAccessKeysAsync(const ListAccessKeysRequest& request, const ListAccessKeysAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, listAccessKeys(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::ListAccessKeysOutcomeCallable RamClient::listAccessKeysCallable(const ListAccessKeysRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ListAccessKeysOutcome()>>(
+			[this, request]()
+			{
+			return this->listAccessKeys(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RamClient::CreateUserOutcome RamClient::createUser(const CreateUserRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -1959,42 +1995,6 @@ RamClient::GetPasswordPolicyOutcomeCallable RamClient::getPasswordPolicyCallable
 	return task->get_future();
 }
 
-RamClient::ListAccessKeysOutcome RamClient::listAccessKeys(const ListAccessKeysRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ListAccessKeysOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ListAccessKeysOutcome(ListAccessKeysResult(outcome.result()));
-	else
-		return ListAccessKeysOutcome(outcome.error());
-}
-
-void RamClient::listAccessKeysAsync(const ListAccessKeysRequest& request, const ListAccessKeysAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, listAccessKeys(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::ListAccessKeysOutcomeCallable RamClient::listAccessKeysCallable(const ListAccessKeysRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ListAccessKeysOutcome()>>(
-			[this, request]()
-			{
-			return this->listAccessKeys(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::DetachPolicyFromGroupOutcome RamClient::detachPolicyFromGroup(const DetachPolicyFromGroupRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2355,42 +2355,6 @@ RamClient::ListVirtualMFADevicesOutcomeCallable RamClient::listVirtualMFADevices
 	return task->get_future();
 }
 
-RamClient::UpdateGroupOutcome RamClient::updateGroup(const UpdateGroupRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return UpdateGroupOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return UpdateGroupOutcome(UpdateGroupResult(outcome.result()));
-	else
-		return UpdateGroupOutcome(outcome.error());
-}
-
-void RamClient::updateGroupAsync(const UpdateGroupRequest& request, const UpdateGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, updateGroup(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-RamClient::UpdateGroupOutcomeCallable RamClient::updateGroupCallable(const UpdateGroupRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<UpdateGroupOutcome()>>(
-			[this, request]()
-			{
-			return this->updateGroup(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 RamClient::GetPolicyOutcome RamClient::getPolicy(const GetPolicyRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -2427,3 +2391,39 @@ RamClient::GetPolicyOutcomeCallable RamClient::getPolicyCallable(const GetPolicy
 	return task->get_future();
 }
 
+RamClient::UpdateGroupOutcome RamClient::updateGroup(const UpdateGroupRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return UpdateGroupOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return UpdateGroupOutcome(UpdateGroupResult(outcome.result()));
+	else
+		return UpdateGroupOutcome(outcome.error());
+}
+
+void RamClient::updateGroupAsync(const UpdateGroupRequest& request, const UpdateGroupAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, updateGroup(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RamClient::UpdateGroupOutcomeCallable RamClient::updateGroupCallable(const UpdateGroupRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<UpdateGroupOutcome()>>(
+			[this, request]()
+			{
+			return this->updateGroup(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+

ram/src/model/AddUserToGroupRequest.cc

@@ -33,7 +33,7 @@ std::string AddUserToGroupRequest::getGroupName()const
 void AddUserToGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 
 std::string AddUserToGroupRequest::getUserName()const
@@ -44,6 +44,6 @@ std::string AddUserToGroupRequest::getUserName()const
 void AddUserToGroupRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/AddUserToGroupResult.cc

@@ -35,10 +35,13 @@ AddUserToGroupResult::~AddUserToGroupResult()
 
 void AddUserToGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/AttachPolicyToGroupRequest.cc

@@ -33,7 +33,7 @@ std::string AttachPolicyToGroupRequest::getPolicyType()const
 void AttachPolicyToGroupRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string AttachPolicyToGroupRequest::getPolicyName()const
@@ -44,7 +44,7 @@ std::string AttachPolicyToGroupRequest::getPolicyName()const
 void AttachPolicyToGroupRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 
 std::string AttachPolicyToGroupRequest::getGroupName()const
@@ -55,6 +55,6 @@ std::string AttachPolicyToGroupRequest::getGroupName()const
 void AttachPolicyToGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/AttachPolicyToGroupResult.cc

@@ -35,10 +35,13 @@ AttachPolicyToGroupResult::~AttachPolicyToGroupResult()
 
 void AttachPolicyToGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/AttachPolicyToRoleRequest.cc

@@ -33,7 +33,7 @@ std::string AttachPolicyToRoleRequest::getPolicyType()const
 void AttachPolicyToRoleRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string AttachPolicyToRoleRequest::getRoleName()const
@@ -44,7 +44,7 @@ std::string AttachPolicyToRoleRequest::getRoleName()const
 void AttachPolicyToRoleRequest::setRoleName(const std::string& roleName)
 {
 	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	setCoreParameter("RoleName", roleName);
 }
 
 std::string AttachPolicyToRoleRequest::getPolicyName()const
@@ -55,6 +55,6 @@ std::string AttachPolicyToRoleRequest::getPolicyName()const
 void AttachPolicyToRoleRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/AttachPolicyToRoleResult.cc

@@ -35,10 +35,13 @@ AttachPolicyToRoleResult::~AttachPolicyToRoleResult()
 
 void AttachPolicyToRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/AttachPolicyToUserRequest.cc

@@ -33,7 +33,7 @@ std::string AttachPolicyToUserRequest::getPolicyType()const
 void AttachPolicyToUserRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string AttachPolicyToUserRequest::getPolicyName()const
@@ -44,7 +44,7 @@ std::string AttachPolicyToUserRequest::getPolicyName()const
 void AttachPolicyToUserRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 
 std::string AttachPolicyToUserRequest::getUserName()const
@@ -55,6 +55,6 @@ std::string AttachPolicyToUserRequest::getUserName()const
 void AttachPolicyToUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/AttachPolicyToUserResult.cc

@@ -35,10 +35,13 @@ AttachPolicyToUserResult::~AttachPolicyToUserResult()
 
 void AttachPolicyToUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/BindMFADeviceRequest.cc

@@ -33,7 +33,7 @@ std::string BindMFADeviceRequest::getSerialNumber()const
 void BindMFADeviceRequest::setSerialNumber(const std::string& serialNumber)
 {
 	serialNumber_ = serialNumber;
-	setParameter("SerialNumber", serialNumber);
+	setCoreParameter("SerialNumber", serialNumber);
 }
 
 std::string BindMFADeviceRequest::getAuthenticationCode2()const
@@ -44,7 +44,7 @@ std::string BindMFADeviceRequest::getAuthenticationCode2()const
 void BindMFADeviceRequest::setAuthenticationCode2(const std::string& authenticationCode2)
 {
 	authenticationCode2_ = authenticationCode2;
-	setParameter("AuthenticationCode2", authenticationCode2);
+	setCoreParameter("AuthenticationCode2", authenticationCode2);
 }
 
 std::string BindMFADeviceRequest::getAuthenticationCode1()const
@@ -55,7 +55,7 @@ std::string BindMFADeviceRequest::getAuthenticationCode1()const
 void BindMFADeviceRequest::setAuthenticationCode1(const std::string& authenticationCode1)
 {
 	authenticationCode1_ = authenticationCode1;
-	setParameter("AuthenticationCode1", authenticationCode1);
+	setCoreParameter("AuthenticationCode1", authenticationCode1);
 }
 
 std::string BindMFADeviceRequest::getUserName()const
@@ -66,6 +66,6 @@ std::string BindMFADeviceRequest::getUserName()const
 void BindMFADeviceRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/BindMFADeviceResult.cc

@@ -35,10 +35,13 @@ BindMFADeviceResult::~BindMFADeviceResult()
 
 void BindMFADeviceResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/ChangePasswordRequest.cc

@@ -33,7 +33,7 @@ std::string ChangePasswordRequest::getOldPassword()const
 void ChangePasswordRequest::setOldPassword(const std::string& oldPassword)
 {
 	oldPassword_ = oldPassword;
-	setParameter("OldPassword", oldPassword);
+	setCoreParameter("OldPassword", oldPassword);
 }
 
 std::string ChangePasswordRequest::getNewPassword()const
@@ -44,6 +44,6 @@ std::string ChangePasswordRequest::getNewPassword()const
 void ChangePasswordRequest::setNewPassword(const std::string& newPassword)
 {
 	newPassword_ = newPassword;
-	setParameter("NewPassword", newPassword);
+	setCoreParameter("NewPassword", newPassword);
 }
 

ram/src/model/ChangePasswordResult.cc

@@ -35,10 +35,13 @@ ChangePasswordResult::~ChangePasswordResult()
 
 void ChangePasswordResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/ClearAccountAliasResult.cc

@@ -35,10 +35,13 @@ ClearAccountAliasResult::~ClearAccountAliasResult()
 
 void ClearAccountAliasResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/CreateAccessKeyRequest.cc

@@ -33,6 +33,6 @@ std::string CreateAccessKeyRequest::getUserName()const
 void CreateAccessKeyRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/CreateAccessKeyResult.cc

@@ -35,10 +35,13 @@ CreateAccessKeyResult::~CreateAccessKeyResult()
 
 void CreateAccessKeyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto accessKeyNode = value["AccessKey"];
 	if(!accessKeyNode["AccessKeyId"].isNull())

ram/src/model/CreateGroupRequest.cc

@@ -33,7 +33,7 @@ std::string CreateGroupRequest::getComments()const
 void CreateGroupRequest::setComments(const std::string& comments)
 {
 	comments_ = comments;
-	setParameter("Comments", comments);
+	setCoreParameter("Comments", comments);
 }
 
 std::string CreateGroupRequest::getGroupName()const
@@ -44,6 +44,6 @@ std::string CreateGroupRequest::getGroupName()const
 void CreateGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/CreateGroupResult.cc

@@ -35,10 +35,13 @@ CreateGroupResult::~CreateGroupResult()
 
 void CreateGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto groupNode = value["Group"];
 	if(!groupNode["GroupName"].isNull())

ram/src/model/CreateLoginProfileRequest.cc

@@ -33,7 +33,7 @@ std::string CreateLoginProfileRequest::getPassword()const
 void CreateLoginProfileRequest::setPassword(const std::string& password)
 {
 	password_ = password;
-	setParameter("Password", password);
+	setCoreParameter("Password", password);
 }
 
 bool CreateLoginProfileRequest::getPasswordResetRequired()const
@@ -44,7 +44,7 @@ bool CreateLoginProfileRequest::getPasswordResetRequired()const
 void CreateLoginProfileRequest::setPasswordResetRequired(bool passwordResetRequired)
 {
 	passwordResetRequired_ = passwordResetRequired;
-	setParameter("PasswordResetRequired", std::to_string(passwordResetRequired));
+	setCoreParameter("PasswordResetRequired", passwordResetRequired ? "true" : "false");
 }
 
 bool CreateLoginProfileRequest::getMFABindRequired()const
@@ -55,7 +55,7 @@ bool CreateLoginProfileRequest::getMFABindRequired()const
 void CreateLoginProfileRequest::setMFABindRequired(bool mFABindRequired)
 {
 	mFABindRequired_ = mFABindRequired;
-	setParameter("MFABindRequired", std::to_string(mFABindRequired));
+	setCoreParameter("MFABindRequired", mFABindRequired ? "true" : "false");
 }
 
 std::string CreateLoginProfileRequest::getUserName()const
@@ -66,6 +66,6 @@ std::string CreateLoginProfileRequest::getUserName()const
 void CreateLoginProfileRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/CreateLoginProfileResult.cc

@@ -35,10 +35,13 @@ CreateLoginProfileResult::~CreateLoginProfileResult()
 
 void CreateLoginProfileResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto loginProfileNode = value["LoginProfile"];
 	if(!loginProfileNode["UserName"].isNull())

ram/src/model/CreatePolicyRequest.cc

@@ -33,7 +33,7 @@ std::string CreatePolicyRequest::getDescription()const
 void CreatePolicyRequest::setDescription(const std::string& description)
 {
 	description_ = description;
-	setParameter("Description", description);
+	setCoreParameter("Description", description);
 }
 
 std::string CreatePolicyRequest::getPolicyName()const
@@ -44,7 +44,7 @@ std::string CreatePolicyRequest::getPolicyName()const
 void CreatePolicyRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 
 std::string CreatePolicyRequest::getPolicyDocument()const
@@ -55,6 +55,6 @@ std::string CreatePolicyRequest::getPolicyDocument()const
 void CreatePolicyRequest::setPolicyDocument(const std::string& policyDocument)
 {
 	policyDocument_ = policyDocument;
-	setParameter("PolicyDocument", policyDocument);
+	setCoreParameter("PolicyDocument", policyDocument);
 }
 

ram/src/model/CreatePolicyResult.cc

@@ -35,10 +35,13 @@ CreatePolicyResult::~CreatePolicyResult()
 
 void CreatePolicyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto policyNode = value["Policy"];
 	if(!policyNode["PolicyName"].isNull())

ram/src/model/CreatePolicyVersionRequest.cc

@@ -33,7 +33,7 @@ bool CreatePolicyVersionRequest::getSetAsDefault()const
 void CreatePolicyVersionRequest::setSetAsDefault(bool setAsDefault)
 {
 	setAsDefault_ = setAsDefault;
-	setParameter("SetAsDefault", std::to_string(setAsDefault));
+	setCoreParameter("SetAsDefault", setAsDefault ? "true" : "false");
 }
 
 std::string CreatePolicyVersionRequest::getPolicyName()const
@@ -44,7 +44,7 @@ std::string CreatePolicyVersionRequest::getPolicyName()const
 void CreatePolicyVersionRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 
 std::string CreatePolicyVersionRequest::getPolicyDocument()const
@@ -55,6 +55,17 @@ std::string CreatePolicyVersionRequest::getPolicyDocument()const
 void CreatePolicyVersionRequest::setPolicyDocument(const std::string& policyDocument)
 {
 	policyDocument_ = policyDocument;
-	setParameter("PolicyDocument", policyDocument);
+	setCoreParameter("PolicyDocument", policyDocument);
+}
+
+std::string CreatePolicyVersionRequest::getRotateStrategy()const
+{
+	return rotateStrategy_;
+}
+
+void CreatePolicyVersionRequest::setRotateStrategy(const std::string& rotateStrategy)
+{
+	rotateStrategy_ = rotateStrategy;
+	setCoreParameter("RotateStrategy", rotateStrategy);
 }
 

ram/src/model/CreatePolicyVersionResult.cc

@@ -35,10 +35,13 @@ CreatePolicyVersionResult::~CreatePolicyVersionResult()
 
 void CreatePolicyVersionResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto policyVersionNode = value["PolicyVersion"];
 	if(!policyVersionNode["VersionId"].isNull())

ram/src/model/CreateRoleRequest.cc

@@ -33,7 +33,7 @@ std::string CreateRoleRequest::getRoleName()const
 void CreateRoleRequest::setRoleName(const std::string& roleName)
 {
 	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	setCoreParameter("RoleName", roleName);
 }
 
 std::string CreateRoleRequest::getDescription()const
@@ -44,7 +44,7 @@ std::string CreateRoleRequest::getDescription()const
 void CreateRoleRequest::setDescription(const std::string& description)
 {
 	description_ = description;
-	setParameter("Description", description);
+	setCoreParameter("Description", description);
 }
 
 std::string CreateRoleRequest::getAssumeRolePolicyDocument()const
@@ -55,6 +55,6 @@ std::string CreateRoleRequest::getAssumeRolePolicyDocument()const
 void CreateRoleRequest::setAssumeRolePolicyDocument(const std::string& assumeRolePolicyDocument)
 {
 	assumeRolePolicyDocument_ = assumeRolePolicyDocument;
-	setParameter("AssumeRolePolicyDocument", assumeRolePolicyDocument);
+	setCoreParameter("AssumeRolePolicyDocument", assumeRolePolicyDocument);
 }
 

ram/src/model/CreateRoleResult.cc

@@ -35,10 +35,13 @@ CreateRoleResult::~CreateRoleResult()
 
 void CreateRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto roleNode = value["Role"];
 	if(!roleNode["RoleId"].isNull())

ram/src/model/CreateUserRequest.cc

@@ -33,7 +33,7 @@ std::string CreateUserRequest::getComments()const
 void CreateUserRequest::setComments(const std::string& comments)
 {
 	comments_ = comments;
-	setParameter("Comments", comments);
+	setCoreParameter("Comments", comments);
 }
 
 std::string CreateUserRequest::getDisplayName()const
@@ -44,7 +44,7 @@ std::string CreateUserRequest::getDisplayName()const
 void CreateUserRequest::setDisplayName(const std::string& displayName)
 {
 	displayName_ = displayName;
-	setParameter("DisplayName", displayName);
+	setCoreParameter("DisplayName", displayName);
 }
 
 std::string CreateUserRequest::getMobilePhone()const
@@ -55,7 +55,7 @@ std::string CreateUserRequest::getMobilePhone()const
 void CreateUserRequest::setMobilePhone(const std::string& mobilePhone)
 {
 	mobilePhone_ = mobilePhone;
-	setParameter("MobilePhone", mobilePhone);
+	setCoreParameter("MobilePhone", mobilePhone);
 }
 
 std::string CreateUserRequest::getEmail()const
@@ -66,7 +66,7 @@ std::string CreateUserRequest::getEmail()const
 void CreateUserRequest::setEmail(const std::string& email)
 {
 	email_ = email;
-	setParameter("Email", email);
+	setCoreParameter("Email", email);
 }
 
 std::string CreateUserRequest::getUserName()const
@@ -77,6 +77,6 @@ std::string CreateUserRequest::getUserName()const
 void CreateUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/CreateUserResult.cc

@@ -35,10 +35,13 @@ CreateUserResult::~CreateUserResult()
 
 void CreateUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto userNode = value["User"];
 	if(!userNode["UserId"].isNull())

ram/src/model/CreateVirtualMFADeviceRequest.cc

@@ -33,6 +33,6 @@ std::string CreateVirtualMFADeviceRequest::getVirtualMFADeviceName()const
 void CreateVirtualMFADeviceRequest::setVirtualMFADeviceName(const std::string& virtualMFADeviceName)
 {
 	virtualMFADeviceName_ = virtualMFADeviceName;
-	setParameter("VirtualMFADeviceName", virtualMFADeviceName);
+	setCoreParameter("VirtualMFADeviceName", virtualMFADeviceName);
 }
 

ram/src/model/CreateVirtualMFADeviceResult.cc

@@ -35,10 +35,13 @@ CreateVirtualMFADeviceResult::~CreateVirtualMFADeviceResult()
 
 void CreateVirtualMFADeviceResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto virtualMFADeviceNode = value["VirtualMFADevice"];
 	if(!virtualMFADeviceNode["SerialNumber"].isNull())

ram/src/model/DeleteAccessKeyRequest.cc

@@ -33,7 +33,7 @@ std::string DeleteAccessKeyRequest::getUserAccessKeyId()const
 void DeleteAccessKeyRequest::setUserAccessKeyId(const std::string& userAccessKeyId)
 {
 	userAccessKeyId_ = userAccessKeyId;
-	setParameter("UserAccessKeyId", userAccessKeyId);
+	setCoreParameter("UserAccessKeyId", userAccessKeyId);
 }
 
 std::string DeleteAccessKeyRequest::getUserName()const
@@ -44,6 +44,6 @@ std::string DeleteAccessKeyRequest::getUserName()const
 void DeleteAccessKeyRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/DeleteAccessKeyResult.cc

@@ -35,10 +35,13 @@ DeleteAccessKeyResult::~DeleteAccessKeyResult()
 
 void DeleteAccessKeyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeleteGroupRequest.cc

@@ -33,6 +33,6 @@ std::string DeleteGroupRequest::getGroupName()const
 void DeleteGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/DeleteGroupResult.cc

@@ -35,10 +35,13 @@ DeleteGroupResult::~DeleteGroupResult()
 
 void DeleteGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeleteLoginProfileRequest.cc

@@ -33,6 +33,6 @@ std::string DeleteLoginProfileRequest::getUserName()const
 void DeleteLoginProfileRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/DeleteLoginProfileResult.cc

@@ -35,10 +35,13 @@ DeleteLoginProfileResult::~DeleteLoginProfileResult()
 
 void DeleteLoginProfileResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeletePolicyRequest.cc

@@ -33,6 +33,6 @@ std::string DeletePolicyRequest::getPolicyName()const
 void DeletePolicyRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/DeletePolicyResult.cc

@@ -35,10 +35,13 @@ DeletePolicyResult::~DeletePolicyResult()
 
 void DeletePolicyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeletePolicyVersionRequest.cc

@@ -33,7 +33,7 @@ std::string DeletePolicyVersionRequest::getVersionId()const
 void DeletePolicyVersionRequest::setVersionId(const std::string& versionId)
 {
 	versionId_ = versionId;
-	setParameter("VersionId", versionId);
+	setCoreParameter("VersionId", versionId);
 }
 
 std::string DeletePolicyVersionRequest::getPolicyName()const
@@ -44,6 +44,6 @@ std::string DeletePolicyVersionRequest::getPolicyName()const
 void DeletePolicyVersionRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/DeletePolicyVersionResult.cc

@@ -35,10 +35,13 @@ DeletePolicyVersionResult::~DeletePolicyVersionResult()
 
 void DeletePolicyVersionResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeleteRoleRequest.cc

@@ -33,6 +33,6 @@ std::string DeleteRoleRequest::getRoleName()const
 void DeleteRoleRequest::setRoleName(const std::string& roleName)
 {
 	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	setCoreParameter("RoleName", roleName);
 }
 

ram/src/model/DeleteRoleResult.cc

@@ -35,10 +35,13 @@ DeleteRoleResult::~DeleteRoleResult()
 
 void DeleteRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeleteUserRequest.cc

@@ -33,6 +33,6 @@ std::string DeleteUserRequest::getUserName()const
 void DeleteUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/DeleteUserResult.cc

@@ -35,10 +35,13 @@ DeleteUserResult::~DeleteUserResult()
 
 void DeleteUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DeleteVirtualMFADeviceRequest.cc

@@ -33,6 +33,6 @@ std::string DeleteVirtualMFADeviceRequest::getSerialNumber()const
 void DeleteVirtualMFADeviceRequest::setSerialNumber(const std::string& serialNumber)
 {
 	serialNumber_ = serialNumber;
-	setParameter("SerialNumber", serialNumber);
+	setCoreParameter("SerialNumber", serialNumber);
 }
 

ram/src/model/DeleteVirtualMFADeviceResult.cc

@@ -35,10 +35,13 @@ DeleteVirtualMFADeviceResult::~DeleteVirtualMFADeviceResult()
 
 void DeleteVirtualMFADeviceResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DetachPolicyFromGroupRequest.cc

@@ -33,7 +33,7 @@ std::string DetachPolicyFromGroupRequest::getPolicyType()const
 void DetachPolicyFromGroupRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string DetachPolicyFromGroupRequest::getPolicyName()const
@@ -44,7 +44,7 @@ std::string DetachPolicyFromGroupRequest::getPolicyName()const
 void DetachPolicyFromGroupRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 
 std::string DetachPolicyFromGroupRequest::getGroupName()const
@@ -55,6 +55,6 @@ std::string DetachPolicyFromGroupRequest::getGroupName()const
 void DetachPolicyFromGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/DetachPolicyFromGroupResult.cc

@@ -35,10 +35,13 @@ DetachPolicyFromGroupResult::~DetachPolicyFromGroupResult()
 
 void DetachPolicyFromGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DetachPolicyFromRoleRequest.cc

@@ -33,7 +33,7 @@ std::string DetachPolicyFromRoleRequest::getPolicyType()const
 void DetachPolicyFromRoleRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string DetachPolicyFromRoleRequest::getRoleName()const
@@ -44,7 +44,7 @@ std::string DetachPolicyFromRoleRequest::getRoleName()const
 void DetachPolicyFromRoleRequest::setRoleName(const std::string& roleName)
 {
 	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	setCoreParameter("RoleName", roleName);
 }
 
 std::string DetachPolicyFromRoleRequest::getPolicyName()const
@@ -55,6 +55,6 @@ std::string DetachPolicyFromRoleRequest::getPolicyName()const
 void DetachPolicyFromRoleRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/DetachPolicyFromRoleResult.cc

@@ -35,10 +35,13 @@ DetachPolicyFromRoleResult::~DetachPolicyFromRoleResult()
 
 void DetachPolicyFromRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/DetachPolicyFromUserRequest.cc

@@ -33,7 +33,7 @@ std::string DetachPolicyFromUserRequest::getPolicyType()const
 void DetachPolicyFromUserRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string DetachPolicyFromUserRequest::getPolicyName()const
@@ -44,7 +44,7 @@ std::string DetachPolicyFromUserRequest::getPolicyName()const
 void DetachPolicyFromUserRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 
 std::string DetachPolicyFromUserRequest::getUserName()const
@@ -55,6 +55,6 @@ std::string DetachPolicyFromUserRequest::getUserName()const
 void DetachPolicyFromUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/DetachPolicyFromUserResult.cc

@@ -35,10 +35,13 @@ DetachPolicyFromUserResult::~DetachPolicyFromUserResult()
 
 void DetachPolicyFromUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/GetAccessKeyLastUsedRequest.cc

@@ -33,7 +33,7 @@ std::string GetAccessKeyLastUsedRequest::getUserAccessKeyId()const
 void GetAccessKeyLastUsedRequest::setUserAccessKeyId(const std::string& userAccessKeyId)
 {
 	userAccessKeyId_ = userAccessKeyId;
-	setParameter("UserAccessKeyId", userAccessKeyId);
+	setCoreParameter("UserAccessKeyId", userAccessKeyId);
 }
 
 std::string GetAccessKeyLastUsedRequest::getUserName()const
@@ -44,6 +44,6 @@ std::string GetAccessKeyLastUsedRequest::getUserName()const
 void GetAccessKeyLastUsedRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/GetAccessKeyLastUsedResult.cc

@@ -35,10 +35,13 @@ GetAccessKeyLastUsedResult::~GetAccessKeyLastUsedResult()
 
 void GetAccessKeyLastUsedResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto accessKeyLastUsedNode = value["AccessKeyLastUsed"];
 	if(!accessKeyLastUsedNode["LastUsedDate"].isNull())

ram/src/model/GetAccountAliasResult.cc

@@ -35,10 +35,13 @@ GetAccountAliasResult::~GetAccountAliasResult()
 
 void GetAccountAliasResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	if(!value["AccountAlias"].isNull())
 		accountAlias_ = value["AccountAlias"].asString();

ram/src/model/GetGroupRequest.cc

@@ -33,6 +33,6 @@ std::string GetGroupRequest::getGroupName()const
 void GetGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/GetGroupResult.cc

@@ -35,10 +35,13 @@ GetGroupResult::~GetGroupResult()
 
 void GetGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto groupNode = value["Group"];
 	if(!groupNode["GroupName"].isNull())

ram/src/model/GetLoginProfileRequest.cc

@@ -33,6 +33,6 @@ std::string GetLoginProfileRequest::getUserName()const
 void GetLoginProfileRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/GetLoginProfileResult.cc

@@ -35,10 +35,13 @@ GetLoginProfileResult::~GetLoginProfileResult()
 
 void GetLoginProfileResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto loginProfileNode = value["LoginProfile"];
 	if(!loginProfileNode["UserName"].isNull())

ram/src/model/GetPasswordPolicyResult.cc

@@ -35,10 +35,13 @@ GetPasswordPolicyResult::~GetPasswordPolicyResult()
 
 void GetPasswordPolicyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto passwordPolicyNode = value["PasswordPolicy"];
 	if(!passwordPolicyNode["MinimumPasswordLength"].isNull())

ram/src/model/GetPolicyRequest.cc

@@ -33,7 +33,7 @@ std::string GetPolicyRequest::getPolicyType()const
 void GetPolicyRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string GetPolicyRequest::getPolicyName()const
@@ -44,6 +44,6 @@ std::string GetPolicyRequest::getPolicyName()const
 void GetPolicyRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/GetPolicyResult.cc

@@ -35,10 +35,13 @@ GetPolicyResult::~GetPolicyResult()
 
 void GetPolicyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto policyNode = value["Policy"];
 	if(!policyNode["PolicyName"].isNull())
@@ -57,6 +60,15 @@ void GetPolicyResult::parse(const std::string &payload)
 		policy_.updateDate = policyNode["UpdateDate"].asString();
 	if(!policyNode["AttachmentCount"].isNull())
 		policy_.attachmentCount = std::stoi(policyNode["AttachmentCount"].asString());
+	auto defaultPolicyVersionNode = value["DefaultPolicyVersion"];
+	if(!defaultPolicyVersionNode["VersionId"].isNull())
+		defaultPolicyVersion_.versionId = defaultPolicyVersionNode["VersionId"].asString();
+	if(!defaultPolicyVersionNode["IsDefaultVersion"].isNull())
+		defaultPolicyVersion_.isDefaultVersion = defaultPolicyVersionNode["IsDefaultVersion"].asString() == "true";
+	if(!defaultPolicyVersionNode["PolicyDocument"].isNull())
+		defaultPolicyVersion_.policyDocument = defaultPolicyVersionNode["PolicyDocument"].asString();
+	if(!defaultPolicyVersionNode["CreateDate"].isNull())
+		defaultPolicyVersion_.createDate = defaultPolicyVersionNode["CreateDate"].asString();
 
 }
 
@@ -65,3 +77,8 @@ GetPolicyResult::Policy GetPolicyResult::getPolicy()const
 	return policy_;
 }
 
+GetPolicyResult::DefaultPolicyVersion GetPolicyResult::getDefaultPolicyVersion()const
+{
+	return defaultPolicyVersion_;
+}
+

ram/src/model/GetPolicyVersionRequest.cc

@@ -33,7 +33,7 @@ std::string GetPolicyVersionRequest::getVersionId()const
 void GetPolicyVersionRequest::setVersionId(const std::string& versionId)
 {
 	versionId_ = versionId;
-	setParameter("VersionId", versionId);
+	setCoreParameter("VersionId", versionId);
 }
 
 std::string GetPolicyVersionRequest::getPolicyType()const
@@ -44,7 +44,7 @@ std::string GetPolicyVersionRequest::getPolicyType()const
 void GetPolicyVersionRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string GetPolicyVersionRequest::getPolicyName()const
@@ -55,6 +55,6 @@ std::string GetPolicyVersionRequest::getPolicyName()const
 void GetPolicyVersionRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/GetPolicyVersionResult.cc

@@ -35,10 +35,13 @@ GetPolicyVersionResult::~GetPolicyVersionResult()
 
 void GetPolicyVersionResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto policyVersionNode = value["PolicyVersion"];
 	if(!policyVersionNode["VersionId"].isNull())

ram/src/model/GetRoleRequest.cc

@@ -33,6 +33,6 @@ std::string GetRoleRequest::getRoleName()const
 void GetRoleRequest::setRoleName(const std::string& roleName)
 {
 	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	setCoreParameter("RoleName", roleName);
 }
 

ram/src/model/GetRoleResult.cc

@@ -35,10 +35,13 @@ GetRoleResult::~GetRoleResult()
 
 void GetRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto roleNode = value["Role"];
 	if(!roleNode["RoleId"].isNull())

ram/src/model/GetSecurityPreferenceResult.cc

@@ -35,10 +35,13 @@ GetSecurityPreferenceResult::~GetSecurityPreferenceResult()
 
 void GetSecurityPreferenceResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto securityPreferenceNode = value["SecurityPreference"];
 	auto loginProfilePreferenceNode = securityPreferenceNode["LoginProfilePreference"];

ram/src/model/GetUserMFAInfoRequest.cc

@@ -33,6 +33,6 @@ std::string GetUserMFAInfoRequest::getUserName()const
 void GetUserMFAInfoRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/GetUserMFAInfoResult.cc

@@ -35,10 +35,13 @@ GetUserMFAInfoResult::~GetUserMFAInfoResult()
 
 void GetUserMFAInfoResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto mFADeviceNode = value["MFADevice"];
 	if(!mFADeviceNode["SerialNumber"].isNull())

ram/src/model/GetUserRequest.cc

@@ -33,6 +33,6 @@ std::string GetUserRequest::getUserName()const
 void GetUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/GetUserResult.cc

@@ -35,10 +35,13 @@ GetUserResult::~GetUserResult()
 
 void GetUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto userNode = value["User"];
 	if(!userNode["UserId"].isNull())

ram/src/model/ListAccessKeysRequest.cc

@@ -33,6 +33,6 @@ std::string ListAccessKeysRequest::getUserName()const
 void ListAccessKeysRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/ListAccessKeysResult.cc

@@ -35,10 +35,13 @@ ListAccessKeysResult::~ListAccessKeysResult()
 
 void ListAccessKeysResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allAccessKeys = value["AccessKeys"]["AccessKey"];
 	for (auto value : allAccessKeys)

ram/src/model/ListEntitiesForPolicyRequest.cc

@@ -33,7 +33,7 @@ std::string ListEntitiesForPolicyRequest::getPolicyType()const
 void ListEntitiesForPolicyRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string ListEntitiesForPolicyRequest::getPolicyName()const
@@ -44,6 +44,6 @@ std::string ListEntitiesForPolicyRequest::getPolicyName()const
 void ListEntitiesForPolicyRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/ListEntitiesForPolicyResult.cc

@@ -35,10 +35,13 @@ ListEntitiesForPolicyResult::~ListEntitiesForPolicyResult()
 
 void ListEntitiesForPolicyResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allGroups = value["Groups"]["Group"];
 	for (auto value : allGroups)

ram/src/model/ListGroupsForUserRequest.cc

@@ -33,6 +33,6 @@ std::string ListGroupsForUserRequest::getUserName()const
 void ListGroupsForUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/ListGroupsForUserResult.cc

@@ -35,10 +35,13 @@ ListGroupsForUserResult::~ListGroupsForUserResult()
 
 void ListGroupsForUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allGroups = value["Groups"]["Group"];
 	for (auto value : allGroups)

ram/src/model/ListGroupsRequest.cc

@@ -33,7 +33,7 @@ std::string ListGroupsRequest::getMarker()const
 void ListGroupsRequest::setMarker(const std::string& marker)
 {
 	marker_ = marker;
-	setParameter("Marker", marker);
+	setCoreParameter("Marker", marker);
 }
 
 int ListGroupsRequest::getMaxItems()const
@@ -44,6 +44,6 @@ int ListGroupsRequest::getMaxItems()const
 void ListGroupsRequest::setMaxItems(int maxItems)
 {
 	maxItems_ = maxItems;
-	setParameter("MaxItems", std::to_string(maxItems));
+	setCoreParameter("MaxItems", std::to_string(maxItems));
 }
 

ram/src/model/ListGroupsResult.cc

@@ -35,10 +35,13 @@ ListGroupsResult::~ListGroupsResult()
 
 void ListGroupsResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allGroups = value["Groups"]["Group"];
 	for (auto value : allGroups)

ram/src/model/ListPoliciesForGroupRequest.cc

@@ -33,6 +33,6 @@ std::string ListPoliciesForGroupRequest::getGroupName()const
 void ListPoliciesForGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/ListPoliciesForGroupResult.cc

@@ -35,10 +35,13 @@ ListPoliciesForGroupResult::~ListPoliciesForGroupResult()
 
 void ListPoliciesForGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allPolicies = value["Policies"]["Policy"];
 	for (auto value : allPolicies)

ram/src/model/ListPoliciesForRoleRequest.cc

@@ -33,6 +33,6 @@ std::string ListPoliciesForRoleRequest::getRoleName()const
 void ListPoliciesForRoleRequest::setRoleName(const std::string& roleName)
 {
 	roleName_ = roleName;
-	setParameter("RoleName", roleName);
+	setCoreParameter("RoleName", roleName);
 }
 

ram/src/model/ListPoliciesForRoleResult.cc

@@ -35,10 +35,13 @@ ListPoliciesForRoleResult::~ListPoliciesForRoleResult()
 
 void ListPoliciesForRoleResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allPolicies = value["Policies"]["Policy"];
 	for (auto value : allPolicies)

ram/src/model/ListPoliciesForUserRequest.cc

@@ -33,6 +33,6 @@ std::string ListPoliciesForUserRequest::getUserName()const
 void ListPoliciesForUserRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/ListPoliciesForUserResult.cc

@@ -35,10 +35,13 @@ ListPoliciesForUserResult::~ListPoliciesForUserResult()
 
 void ListPoliciesForUserResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allPolicies = value["Policies"]["Policy"];
 	for (auto value : allPolicies)

ram/src/model/ListPoliciesRequest.cc

@@ -33,7 +33,7 @@ std::string ListPoliciesRequest::getPolicyType()const
 void ListPoliciesRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string ListPoliciesRequest::getMarker()const
@@ -44,7 +44,7 @@ std::string ListPoliciesRequest::getMarker()const
 void ListPoliciesRequest::setMarker(const std::string& marker)
 {
 	marker_ = marker;
-	setParameter("Marker", marker);
+	setCoreParameter("Marker", marker);
 }
 
 int ListPoliciesRequest::getMaxItems()const
@@ -55,6 +55,6 @@ int ListPoliciesRequest::getMaxItems()const
 void ListPoliciesRequest::setMaxItems(int maxItems)
 {
 	maxItems_ = maxItems;
-	setParameter("MaxItems", std::to_string(maxItems));
+	setCoreParameter("MaxItems", std::to_string(maxItems));
 }
 

ram/src/model/ListPoliciesResult.cc

@@ -35,10 +35,13 @@ ListPoliciesResult::~ListPoliciesResult()
 
 void ListPoliciesResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allPolicies = value["Policies"]["Policy"];
 	for (auto value : allPolicies)

ram/src/model/ListPolicyVersionsRequest.cc

@@ -33,7 +33,7 @@ std::string ListPolicyVersionsRequest::getPolicyType()const
 void ListPolicyVersionsRequest::setPolicyType(const std::string& policyType)
 {
 	policyType_ = policyType;
-	setParameter("PolicyType", policyType);
+	setCoreParameter("PolicyType", policyType);
 }
 
 std::string ListPolicyVersionsRequest::getPolicyName()const
@@ -44,6 +44,6 @@ std::string ListPolicyVersionsRequest::getPolicyName()const
 void ListPolicyVersionsRequest::setPolicyName(const std::string& policyName)
 {
 	policyName_ = policyName;
-	setParameter("PolicyName", policyName);
+	setCoreParameter("PolicyName", policyName);
 }
 

ram/src/model/ListPolicyVersionsResult.cc

@@ -35,10 +35,13 @@ ListPolicyVersionsResult::~ListPolicyVersionsResult()
 
 void ListPolicyVersionsResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allPolicyVersions = value["PolicyVersions"]["PolicyVersion"];
 	for (auto value : allPolicyVersions)

ram/src/model/ListRolesRequest.cc

@@ -33,7 +33,7 @@ std::string ListRolesRequest::getMarker()const
 void ListRolesRequest::setMarker(const std::string& marker)
 {
 	marker_ = marker;
-	setParameter("Marker", marker);
+	setCoreParameter("Marker", marker);
 }
 
 int ListRolesRequest::getMaxItems()const
@@ -44,6 +44,6 @@ int ListRolesRequest::getMaxItems()const
 void ListRolesRequest::setMaxItems(int maxItems)
 {
 	maxItems_ = maxItems;
-	setParameter("MaxItems", std::to_string(maxItems));
+	setCoreParameter("MaxItems", std::to_string(maxItems));
 }
 

ram/src/model/ListRolesResult.cc

@@ -35,10 +35,13 @@ ListRolesResult::~ListRolesResult()
 
 void ListRolesResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allRoles = value["Roles"]["Role"];
 	for (auto value : allRoles)

ram/src/model/ListUsersForGroupRequest.cc

@@ -33,7 +33,7 @@ std::string ListUsersForGroupRequest::getMarker()const
 void ListUsersForGroupRequest::setMarker(const std::string& marker)
 {
 	marker_ = marker;
-	setParameter("Marker", marker);
+	setCoreParameter("Marker", marker);
 }
 
 int ListUsersForGroupRequest::getMaxItems()const
@@ -44,7 +44,7 @@ int ListUsersForGroupRequest::getMaxItems()const
 void ListUsersForGroupRequest::setMaxItems(int maxItems)
 {
 	maxItems_ = maxItems;
-	setParameter("MaxItems", std::to_string(maxItems));
+	setCoreParameter("MaxItems", std::to_string(maxItems));
 }
 
 std::string ListUsersForGroupRequest::getGroupName()const
@@ -55,6 +55,6 @@ std::string ListUsersForGroupRequest::getGroupName()const
 void ListUsersForGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 

ram/src/model/ListUsersForGroupResult.cc

@@ -35,10 +35,13 @@ ListUsersForGroupResult::~ListUsersForGroupResult()
 
 void ListUsersForGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allUsers = value["Users"]["User"];
 	for (auto value : allUsers)

ram/src/model/ListUsersRequest.cc

@@ -33,7 +33,7 @@ std::string ListUsersRequest::getMarker()const
 void ListUsersRequest::setMarker(const std::string& marker)
 {
 	marker_ = marker;
-	setParameter("Marker", marker);
+	setCoreParameter("Marker", marker);
 }
 
 int ListUsersRequest::getMaxItems()const
@@ -44,6 +44,6 @@ int ListUsersRequest::getMaxItems()const
 void ListUsersRequest::setMaxItems(int maxItems)
 {
 	maxItems_ = maxItems;
-	setParameter("MaxItems", std::to_string(maxItems));
+	setCoreParameter("MaxItems", std::to_string(maxItems));
 }
 

ram/src/model/ListUsersResult.cc

@@ -35,10 +35,13 @@ ListUsersResult::~ListUsersResult()
 
 void ListUsersResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allUsers = value["Users"]["User"];
 	for (auto value : allUsers)

ram/src/model/ListVirtualMFADevicesResult.cc

@@ -35,10 +35,13 @@ ListVirtualMFADevicesResult::~ListVirtualMFADevicesResult()
 
 void ListVirtualMFADevicesResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 	auto allVirtualMFADevices = value["VirtualMFADevices"]["VirtualMFADevice"];
 	for (auto value : allVirtualMFADevices)

ram/src/model/RemoveUserFromGroupRequest.cc

@@ -33,7 +33,7 @@ std::string RemoveUserFromGroupRequest::getGroupName()const
 void RemoveUserFromGroupRequest::setGroupName(const std::string& groupName)
 {
 	groupName_ = groupName;
-	setParameter("GroupName", groupName);
+	setCoreParameter("GroupName", groupName);
 }
 
 std::string RemoveUserFromGroupRequest::getUserName()const
@@ -44,6 +44,6 @@ std::string RemoveUserFromGroupRequest::getUserName()const
 void RemoveUserFromGroupRequest::setUserName(const std::string& userName)
 {
 	userName_ = userName;
-	setParameter("UserName", userName);
+	setCoreParameter("UserName", userName);
 }
 

ram/src/model/RemoveUserFromGroupResult.cc

@@ -35,10 +35,13 @@ RemoveUserFromGroupResult::~RemoveUserFromGroupResult()
 
 void RemoveUserFromGroupResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }

ram/src/model/SetAccountAliasRequest.cc

@@ -33,6 +33,6 @@ std::string SetAccountAliasRequest::getAccountAlias()const
 void SetAccountAliasRequest::setAccountAlias(const std::string& accountAlias)
 {
 	accountAlias_ = accountAlias;
-	setParameter("AccountAlias", accountAlias);
+	setCoreParameter("AccountAlias", accountAlias);
 }
 

ram/src/model/SetAccountAliasResult.cc

@@ -35,10 +35,13 @@ SetAccountAliasResult::~SetAccountAliasResult()
 
 void SetAccountAliasResult::parse(const std::string &payload)
 {
-	Json::Reader reader;
+	Json::CharReaderBuilder builder;
+	Json::CharReader *reader = builder.newCharReader();
+	Json::Value *val;
 	Json::Value value;
-	reader.parse(payload, value);
-
+	JSONCPP_STRING *errs;
+	reader->parse(payload.data(), payload.data() + payload.size(), val, errs);
+	value = *val;
 	setRequestId(value["RequestId"].asString());
 
 }